diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml b/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml index 29b242d67e..0057d3d9a6 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/cs.xml @@ -1194,7 +1194,6 @@ Vyberte verzi, kterou chcete porovnat s aktuální verzí - Současná verze Červený text nebude ve vybrané verzi zobrazen, zelený znamená přidaný].]]> Dokument byl vrácen na starší verzi Tohle zobrazuje vybranou verzi jako html, jestliže chcete vidět rozdíly mezi 2 verzemi najednou, použijte rozdílové zobrazení diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml b/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml index e34cc2ab29..012a1bc0b9 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/cy.xml @@ -1523,8 +1523,6 @@ Er mwyn gweinyddu eich gwefan, agorwch swyddfa gefn Umbraco a dechreuwch ychwang Dewis fersiwn i gymharu efo fersiwn bresennol Newidiadau - Creuwyd - Fersiwn bresennol Ni fydd testun coch yn cael ei ddangos yn y fersiwn dewiswyd. , mae gwyrdd yn golygu wedi'i ychwanegu]]> Dogfen wedi'i rolio yn ôl Mae hyn yn dangos y fersiwn dewiswyd ar ffurf HTML, os hoffwch weld y gwahaniaeth rhwng 2 fersiwn ar yr un pryd, defnyddiwch y wedd gwahaniaethol diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml index 2f64dc66bf..c8a5dc0c99 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml @@ -1238,11 +1238,10 @@ Mange hilsner fra Umbraco robotten Ændringer - Oprettet Vælg en version at sammenligne med den nuværende version - Nuværende version Rød tekst vil ikke blive vist i den valgte version. Grøn betyder tilføjet]]> + Der er ingen forskelle mellem den nuværende version og den valgte version Dokument tilbagerullet Her vises den valgte version som html. Hvis du ønsker at se forskellen mellem de 2 versioner på samme tid, brug 'diff'-oversigten diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/de.xml b/src/Umbraco.Core/EmbeddedResources/Lang/de.xml index 24999a1187..448453778b 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/de.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/de.xml @@ -1260,7 +1260,6 @@ Wählen Sie eine Version, um diese mit der aktuellen zu vergleichen - Aktuelle Version Zeigt die Unterschiede zwischen der aktuellen und der ausgewählten Version an.<br />Text in <del>rot</del> fehlen in der ausgewählten Version, <ins>grün</ins> markierter Text wurde hinzugefügt. Dokument wurde zurückgesetzt Zeigt die ausgewählte Version als HTML an. Wenn Sie sich die Unterschiede zwischen zwei Versionen anzeigen lassen wollen, benutzen Sie bitte die Vergleichsansicht. diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml index 03b1e0a584..b8c12eb0ac 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml @@ -1449,10 +1449,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Changes - Created - Current version - Red text will be removed in the selected version, green text will be added]]> + Red text will be removed in the selected version, green text will be added]]> + There are no differences between the current (draft) version and the selected version Document has been rolled back Select a version to compare with the current version This displays the selected version as HTML, if you wish to see the difference between 2 diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml index f00ce4d88c..9aef174996 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml @@ -1489,11 +1489,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Changes - Created Select a version to compare with the current version - Current version - Red text will be removed in the selected version, green text will be added]]> + Red text will be removed in the selected version, green text will be added]]> + There are no differences between the current (draft) version and the selected version Document has been rolled back This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view @@ -1503,7 +1502,6 @@ To manage your website, simply open the Umbraco backoffice and start adding cont View Versions - Current draft version Current published version diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/es.xml b/src/Umbraco.Core/EmbeddedResources/Lang/es.xml index 1ed96d8807..4a111302b3 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/es.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/es.xml @@ -898,7 +898,6 @@ Reiniciar - Versión actual Red el texto de la versión seleccionada no se mostrará. , el verde significa añadido]]> Se ha recuperado la última versión del documento. Esto muestra la versión seleccionada como html, si deseas ver la diferencia entre 2 versiones al mismo tiempo, por favor usa la vista diff diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml b/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml index 24d5f565e5..384981e467 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/fr.xml @@ -1251,7 +1251,6 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à Sélectionnez une version à comparer avec la version actuelle - Version actuelle Le texte en Rouge signifie qu'il a été supprimé de la version choisie, vert signifie ajouté]]> Le document a été restauré à une version antérieure Ceci affiche la version choisie en tant que HTML, si vous souhaitez voir les différences entre les deux versions en même temps, utilisez la vue différentielle diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/he.xml b/src/Umbraco.Core/EmbeddedResources/Lang/he.xml index c52961307d..819e71aec9 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/he.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/he.xml @@ -589,7 +589,6 @@ To manage your website, simply open the Umbraco backoffice and start adding cont הסר קישור - גירסה עדכנית טקסט אדום לא יוצג בגרסא שנבחרה, טקסט ירוק מייצט טקסט שנוסף.]]> המסמך שוחזר בהצלחה להלן הגרסא שנבחרה כHTML, אם הינך לצפות בשינויים בין שתי הגרסאות בו זמנית, בחר ב diff diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/it.xml b/src/Umbraco.Core/EmbeddedResources/Lang/it.xml index cea82fc4e0..c85274b80f 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/it.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/it.xml @@ -1530,9 +1530,7 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Modifiche - Creato Seleziona una versione da confrontare con la versione corrente - Il testo in rosso non verrà mostrato nella versione selezionata, quello in verde verrà aggiunto]]> diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml index bcf9e8c9a9..28d512973f 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ja.xml @@ -730,7 +730,6 @@ Runwayをインストールして作られた新しいウェブサイトがど リセット - 現在の版 赤 の文字列は以前の版にはない部分で、緑の文字列は以前の版にのみある部分です。]]> ドキュメントは以前の版に戻りました 選択した版をhtmlで表示します。２つの版の比較を表示したいときは、Diff を選択してください。 diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml index 6a20975bb1..dfe848387c 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ko.xml @@ -575,7 +575,6 @@ 링크 삭제 - 현재 버전 빨간 텍스트는 선택한 버전에선 보이지 않습니다. 녹색은 추가되었음을 의미합니다]]> 문서가 롤백되었습니다. 선택한 버전을 html로 보여줍니다. 두 버전의 차이점을 동시에 보시려면, 차이점 보기를 사용하세요 diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml b/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml index 87bcb3138a..c19aa1df4f 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/nb.xml @@ -621,7 +621,6 @@ Vennlig hilsen Umbraco roboten Nullstill - Gjeldende versjon Rød tekst vil ikke bli vist i den valgte versjonen. , grønn betyr lagt til]]> Dokumentet er tilbakeført til en tidligere versjon Dette viser den valgte versjonen som HTML, bruk avviksvisningen hvis du ønsker å se forksjellene mellom to versjoner samtidig. diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml b/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml index e19ef083e5..debfd51023 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/nl.xml @@ -1253,9 +1253,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Wijzigingen - Aangemaakt Selecteer een versie om te vergelijken met de huidige versie - Huidige versie Rode tekst wordt niet getoond in de geselecteerde versie, groen betekent toegevoegd]]> Document is teruggezet @@ -1267,7 +1265,6 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Bekijk Versies - Conceptversie Gepubliceerde versie diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml b/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml index 4801371fd8..a4d891fd8f 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/pl.xml @@ -881,7 +881,6 @@ Naciśnij przycisk instaluj, aby zainstalować bazę danych Umb Resetuj - Aktualna wersja Czerwony tekst nie będzie pokazany w wybranej wersji, zielony tekst został dodany]]> Dokument został przywrócony Tu widać wybraną wersję jako html, jeżeli chcesz zobaczyć różnicę pomiędzy 2 wersjami w tym samym czasie, użyj podglądu różnic diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml b/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml index 25060a4bd3..b5fd920365 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/pt.xml @@ -565,7 +565,6 @@ Você pode publicar esta página e todas suas sub-páginas ao selecionar pub Remover Link - Versão atual Texto vermelho não será mostrado na versão selecionada; verde significa adicionado]]> Documento foi revertido Isto mostra a versão selecionada como html se você deseja ver as diferenças entre as 2 versões ao mesmo tempo use a visão em diff diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml b/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml index d5b31e47d2..f83dd5285c 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/ru.xml @@ -1195,7 +1195,6 @@ '%0%' была переименована в '%1%' - Текущая версия Красным отмечен текст, которого уже нет в последней версии, зеленым - текст, который добавлен]]> Произведен откат к ранней версии Текущая версия показана в виде HTML. Для просмотра различий в версиях выберите режим сравнения diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml b/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml index fa359fbbbc..e2e7cbcd76 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/sv.xml @@ -675,7 +675,6 @@ Återställ - Nuvarande version Röd text kommer inte att synas i den valda versionen. , Grön betyder att den har tillkommit]]> Dokumentet har återgått till en tidigare version Här visas den valda sidversionen i HTML. Om du vill se skillnaden mellan två versioner samtidigt, välj istället "Diff". diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml b/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml index 47549f5f40..30a38ba6c7 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/tr.xml @@ -1319,8 +1319,6 @@ Web sitenizi yönetmek için, Umbraco'nun arka ofisini açın ve içerik eklemey Değişiklikler - Oluşturuldu - Mevcut sürüm Kırmızı metin seçili sürümde gösterilmeyecektir. , yeşil eklendi demektir ]]> Belge geri alındı ​​ Mevcut sürümle karşılaştırmak için bir sürüm seçin diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml b/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml index 5d9a6e9ab3..199b185ed3 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/zh.xml @@ -763,7 +763,6 @@ Reset - 当前版本 红色是选中版本中没有的。绿色是新增的]]> 文档已回滚 diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml b/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml index b3e3b7bdcf..d57c1c614d 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/zh_tw.xml @@ -753,7 +753,6 @@ 重設 - 當前版本 紅色 文字將不會顯示於所選版本，而綠色表示增加部分。]]> 文檔已回滾 這顯示所選版本的HTML格式，如果您想要比較兩版本的差異，請使用比較檢視 diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js index d270a7171e..d59bbcefcf 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js @@ -73,11 +73,13 @@ getVersions(); } + function canRollback(version) { + return !version.currentDraftVersion; + } + function changeVersion(version) { - const canRollback = !version.currentDraftVersion && !version.currentPublishedVersion; - - if (canRollback === false) { + if (canRollback(version) === false) { return; } @@ -92,6 +94,7 @@ vm.loadingDiff = true; const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null; + vm.previousVersion = null; contentResource.getRollbackVersion(version.versionId, culture) .then(function(data) { vm.previousVersion = data; @@ -99,8 +102,11 @@ vm.previousVersion.displayValue = version.displayValue + ' - ' + version.username; createDiff(vm.currentVersion, vm.previousVersion); + const changed = (part) => part.added || part.removed; + vm.diffHasChanges = vm.diff.name.some(changed) || vm.diff.properties.some((property) => property.diff.some(changed)); + vm.loadingDiff = false; - vm.rollbackButtonDisabled = false; + vm.rollbackButtonDisabled = !vm.diffHasChanges; }, function () { vm.loadingDiff = false; }); @@ -131,11 +137,14 @@ // get current backoffice user and format dates userService.getCurrentUser().then(function (currentUser) { - vm.previousVersions = data.items.map(version => { - var timestampFormatted = dateHelper.getLocalDate(version.versionDate, currentUser.locale, 'LLL'); - version.displayValue = timestampFormatted; - return version; - }); + vm.previousVersions = data.items + // we don't ever want to show the draft version in the rollback list + .filter(version => version.currentDraftVersion === false) + .map(version => { + var timestampFormatted = dateHelper.getLocalDate(version.versionDate, currentUser.locale, 'LLL'); + version.displayValue = timestampFormatted; + return version; + }); }); }); } @@ -173,7 +182,7 @@ // copy existing properties, so it doesn't manipulate existing properties on page oldProperty = Utilities.copy(oldProperty); property = Utilities.copy(property); - + // we have to make properties storing values as object into strings (Grid, nested content, etc.) if (property.value instanceof Object) { property.value = JSON.stringify(property.value, null, 1); @@ -188,14 +197,14 @@ // diff requires a string property.value = property.value ? property.value + '' : ''; oldProperty.value = oldProperty.value ? oldProperty.value + '' : ''; - + const diffProperty = { 'alias': property.alias, 'label': property.label, 'diff': property.isObject ? Diff.diffJson(property.value, oldProperty.value) : Diff.diffWords(property.value, oldProperty.value), 'isObject': property.isObject || oldProperty.isObject }; - + vm.diff.properties.push(diffProperty); } }); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html index 2ad16e83f6..e6f2a1c3a5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html @@ -21,7 +21,7 @@ - @@ -42,17 +42,12 @@
-
- Current version: - {{vm.currentVersion.name}} (Created: {{vm.currentVersion.createDate}}) -
-
-
@@ -61,12 +56,11 @@
{{version.username}}
Current version - Current version
-
- + - - This shows the differences between the current version and the selected version
Red text will be + + This shows the differences between the current (draft) version and the selected version
Red text will be removed in the selected version, green text will be added + + There are no differences between the current (draft) version and the selected version + - +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less index e7953a4fea..50c66fb9f4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.less @@ -14,12 +14,6 @@ position: relative; } - .current-version { - background: @gray-10; - padding: 15px; - margin-bottom: 12px; - } - .culture-select { margin-bottom: 12px; } @@ -29,4 +23,4 @@ font-size: 13px; } -} \ No newline at end of file +} diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts index 7d2306bc03..be24a7990d 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/content.spec.ts @@ -271,6 +271,7 @@ test.describe('Content tests', () => { .addVariant() .withName(initialNodeName) .withSave(true) + .withPublish(true) .done() .build(); await umbracoApi.content.save(rootContentNode); @@ -285,7 +286,7 @@ test.describe('Content tests', () => { await page.keyboard.press('Backspace'); await umbracoUi.setEditorHeaderName(newNodeName); - await umbracoUi.clickElement(umbracoUi.getButtonByLabelKey(ConstantHelper.buttons.saveAndPublish)); + await umbracoUi.clickElement(umbracoUi.getButtonByLabelKey(ConstantHelper.buttons.save)); await umbracoUi.isSuccessNotificationVisible(); await page.locator('span:has-text("×")').click(); @@ -298,7 +299,7 @@ test.describe('Content tests', () => { await page.locator('[action="vm.rollback()"]').click(); await umbracoUi.refreshContentTree(); - await expect(page.locator('.umb-badge >> text=Save')).toBeVisible(); + await expect(page.locator('.umb-badge >> text=Save')).toHaveCount(2); await expect(page.locator('.umb-badge >> text=RollBack')).toBeVisible(); const node = await umbracoUi.getTreeItem("content", [initialNodeName]) await expect(node).toBeVisible();