+ * contentResource.getRollbackVersions(id, culture)
+ * .then(function(versions) {
+ * alert('its here!');
+ * });
+ *
+ *
+ * @param {Int} id Id of node
+ * @param {Int} culture if provided, the results will be for this specific culture/variant
+ * @returns {Promise} resourcePromise object containing the versions
+ *
+ */
+ getRollbackVersions: function (contentId, culture) {
+ return umbRequestHelper.resourcePromise(
+ $http.get(
+ umbRequestHelper.getApiUrl("contentApiBaseUrl", "GetRollbackVersions", {
+ contentId: contentId,
+ culture: culture
+ })
+ ),
+ "Failed to get rollback versions for content item with id " + contentId
+ );
+ },
+
+ /**
+ * @ngdoc method
+ * @name umbraco.resources.contentResource#getRollbackVersion
+ * @methodOf umbraco.resources.contentResource
+ *
+ * @description
+ * Returns a previous version of a content item
+ *
+ * ##usage
+ *
+ * contentResource.getRollbackVersion(versionId, culture)
+ * .then(function(version) {
+ * alert('its here!');
+ * });
+ *
+ *
+ * @param {Int} versionId The version Id
+ * @param {Int} culture if provided, the results will be for this specific culture/variant
+ * @returns {Promise} resourcePromise object containing the version
+ *
+ */
+ getRollbackVersion: function (versionId, culture) {
+ return umbRequestHelper.resourcePromise(
+ $http.get(
+ umbRequestHelper.getApiUrl("contentApiBaseUrl", "GetRollbackVersion", {
+ versionId: versionId,
+ culture: culture
+ })
+ ),
+ "Failed to get version for content item with id " + versionId
+ );
+ },
+
+ /**
+ * @ngdoc method
+ * @name umbraco.resources.contentResource#rollback
+ * @methodOf umbraco.resources.contentResource
+ *
+ * @description
+ * Roll backs a content item to a previous version
+ *
+ * ##usage
+ *
+ * contentResource.rollback(contentId, versionId, culture)
+ * .then(function() {
+ * alert('its here!');
+ * });
+ *
+ *
+ * @param {Int} id Id of node
+ * @param {Int} versionId The version Id
+ * @param {Int} culture if provided, the results will be for this specific culture/variant
+ * @returns {Promise} resourcePromise object
+ *
+ */
+ rollback: function (contentId, versionId, culture) {
+ return umbRequestHelper.resourcePromise(
+ $http.post(
+ umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostRollbackContent", {
+ contentId: contentId, versionId:versionId, culture:culture
+ })
+ ),
+ "Failed to roll back content item with id " + contentId
+ );
+ }
};
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
index a75e8d4a47..31ff5ff47b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
@@ -188,7 +188,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
hotKey: "ctrl+u",
hotKeyWhenHidden: true,
alias: "unpublish",
- addEllipsis: args.content.variants && args.content.variants.length > 1 ? "true" : "false"
+ addEllipsis: "true"
};
case "SCHEDULE":
//schedule publish - schedule doesn't have a permission letter so
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index eab167c2ec..7d1ef3e9b9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -180,6 +180,25 @@
open(editor);
}
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#rollback
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens a rollback editor in infinite editing.
+ * @param {String} editor.node The node to rollback
+ * @param {Callback} editor.submit Saves, submits, and closes the editor
+ * @param {Callback} editor.close Closes the editor
+ * @returns {Object} editor object
+ */
+
+ function rollback(editor) {
+ editor.view = "views/common/infiniteeditors/rollback/rollback.html";
+ editor.size = "small";
+ open(editor);
+ }
+
/**
* @ngdoc method
* @name umbraco.services.editorService#linkPicker
@@ -481,6 +500,7 @@
copy: copy,
move: move,
embed: embed,
+ rollback: rollback,
linkPicker: linkPicker,
mediaPicker: mediaPicker,
iconPicker: iconPicker,
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
index 4b670ab781..d3f2fee5d5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button.less
@@ -104,7 +104,7 @@
}
.umb-button--xs {
- padding: 5px 16px;
+ padding: 5px 13px;
font-size: 14px;
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
index f2cacc26b3..fb83504a1f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-box.less
@@ -8,6 +8,9 @@
.umb-box-header {
padding: 10px 20px;
border-bottom: 1px solid @gray-9;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
}
.umb-box-header-title {
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
index 7acf47d22e..de2dca5f91 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less
@@ -1,18 +1,13 @@
.umb-user-cards {
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
- margin: -10px;
+ display: grid;
+ grid-gap: 20px;
+ grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
}
.umb-user-card {
- padding: 10px;
box-sizing: border-box;
- flex: 0 0 100%;
max-width: 100%;
display: flex;
- flex-wrap: wrap;
- flex-direction: column;
}
.umb-user-card:hover,
@@ -21,49 +16,6 @@
text-decoration: none !important;
}
-@media (min-width: 768px) {
- .umb-user-card {
- flex: 0 0 50%;
- max-width: 50%;
- }
-}
-
-@media (min-width: 1200px) {
- .umb-user-card {
- flex: 0 0 33.33%;
- max-width: 33.33%;
- }
-}
-
-@media (min-width: 1400px) {
- .umb-user-card {
- flex: 0 0 25%;
- max-width: 25%;
- }
-}
-
-@media (min-width: 1700px) {
- .umb-user-card {
- flex: 0 0 20%;
- max-width: 20%;
- }
-}
-
-
-@media (min-width: 1900px) {
- .umb-user-card {
- flex: 0 0 16.66%;
- max-width: 16.66%;
- }
-}
-
-@media (min-width: 2200px) {
- .umb-user-card {
- flex: 0 0 14.28%;
- max-width: 14.28%;
- }
-}
-
.umb-user-card__content {
position: relative;
padding: 15px;
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 43f5aa5a9a..198885e6be 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -2,7 +2,12 @@
// Container styles
// --------------------------------------------------
.umb-property-editor {
- min-width:66.6%;
+ @media (max-width: 800px) {
+ width: 100%;
+ }
+ @media (min-width: 800px) {
+ min-width:66.6%;
+ }
&-pull {
float:left;
diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_white-space.less b/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_white-space.less
index b8fb5ca5db..5767b0b474 100644
--- a/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_white-space.less
+++ b/src/Umbraco.Web.UI.Client/src/less/utilities/typography/_white-space.less
@@ -7,6 +7,8 @@
.ws-normal { white-space: normal; }
.nowrap { white-space: nowrap; }
.pre { white-space: pre; }
+.pre-wrap { white-space: pre-wrap; }
+.pre-line { white-space: pre-line; }
.truncate {
white-space: nowrap;
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
new file mode 100644
index 0000000000..6b8462b583
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -0,0 +1,177 @@
+(function () {
+ "use strict";
+
+ function RollbackController($scope, contentResource, localizationService, assetsService) {
+
+ var vm = this;
+
+ vm.rollback = rollback;
+ vm.changeLanguage = changeLanguage;
+ vm.changeVersion = changeVersion;
+ vm.submit = submit;
+ vm.close = close;
+
+ //////////
+
+ function onInit() {
+
+ vm.loading = true;
+ vm.variantVersions = [];
+ vm.diff = null;
+ vm.currentVersion = null;
+ vm.rollbackButtonDisabled = true;
+
+ // find the current version for invariant nodes
+ if($scope.model.node.variants.length === 1) {
+ vm.currentVersion = $scope.model.node.variants[0];
+ }
+
+ // find the current version for nodes with variants
+ if($scope.model.node.variants.length > 1) {
+ var active = _.find($scope.model.node.variants, function (v) {
+ return v.active;
+ });
+
+ // preselect the language in the dropdown
+ if(active) {
+ vm.selectedLanguage = active;
+ vm.currentVersion = active;
+ }
+ }
+
+ // set default title
+ if(!$scope.model.title) {
+ localizationService.localize("actions_rollback").then(function(value){
+ $scope.model.title = value;
+ });
+ }
+
+ // Load in diff library
+ assetsService.loadJs('lib/jsdiff/diff.min.js', $scope).then(function () {
+
+ getVersions().then(function(){
+ vm.loading = false;
+ });
+
+ });
+
+ }
+
+ function changeLanguage(language) {
+ vm.currentVersion = language;
+ getVersions();
+ }
+
+ function changeVersion(version) {
+
+ if(version && version.versionId) {
+
+ const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;
+
+ contentResource.getRollbackVersion(version.versionId, culture)
+ .then(function(data){
+ vm.previousVersion = data;
+ vm.previousVersion.versionId = version.versionId;
+ createDiff(vm.currentVersion, vm.previousVersion);
+ vm.rollbackButtonDisabled = false;
+ });
+
+ } else {
+ vm.diff = null;
+ vm.rollbackButtonDisabled = true;
+ }
+ }
+
+ function getVersions() {
+
+ const nodeId = $scope.model.node.id;
+ const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;
+
+ return contentResource.getRollbackVersions(nodeId, culture)
+ .then(function(data){
+ vm.previousVersions = data.map(version => {
+ version.displayValue = version.versionDate + " - " + version.versionAuthorName;
+ return version;
+ });
+ });
+ }
+
+ /**
+ * This will load in a new version
+ */
+ function createDiff(currentVersion, previousVersion) {
+
+ vm.diff = {};
+ vm.diff.properties = [];
+
+ // find diff in name
+ vm.diff.name = JsDiff.diffWords(currentVersion.name, previousVersion.name);
+
+ // extract all properties from the tabs and create new object for the diff
+ currentVersion.tabs.forEach((tab, tabIndex) => {
+ tab.properties.forEach((property, propertyIndex) => {
+ var oldProperty = previousVersion.tabs[tabIndex].properties[propertyIndex];
+
+ // 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);
+ property.isObject = true;
+ }
+
+ if(oldProperty.value instanceof Object) {
+ oldProperty.value = JSON.stringify(oldProperty.value, null, 1);
+ oldProperty.isObject = true;
+ }
+
+ // create new property object used in the diff table
+ var diffProperty = {
+ "alias": property.alias,
+ "label": property.label,
+ "diff": (property.value || oldProperty.value) ? JsDiff.diffWords(property.value, oldProperty.value) : "",
+ "isObject": (property.isObject || oldProperty.isObject) ? true : false
+ };
+
+ vm.diff.properties.push(diffProperty);
+
+ });
+ });
+
+ }
+
+ function rollback() {
+
+ vm.rollbackButtonState = "busy";
+
+ const nodeId = $scope.model.node.id;
+ const versionId = vm.previousVersion.versionId;
+ const culture = $scope.model.node.variants.length > 1 ? vm.currentVersion.language.culture : null;
+
+ return contentResource.rollback(nodeId, versionId, culture)
+ .then(data => {
+ vm.rollbackButtonState = "success";
+ submit();
+ }, error => {
+ vm.rollbackButtonState = "error";
+ });
+
+ }
+
+ function submit() {
+ if($scope.model.submit) {
+ $scope.model.submit($scope.model.submit);
+ }
+ }
+
+ function close() {
+ if($scope.model.close) {
+ $scope.model.close();
+ }
+ }
+
+ onInit();
+
+ }
+
+ angular.module("umbraco").controller("Umbraco.Editors.RollbackController", RollbackController);
+
+})();
\ No newline at end of file
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
new file mode 100644
index 0000000000..f7ab78b7a0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.html
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
index bdc4ad6c7f..1cfdb92610 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
@@ -41,7 +41,19 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{vm.currentVersion.name}} (Created: {{vm.currentVersion.createDate}})
+ +
+
+
+
+
+
+
+
+ Changes
+| Name | +
+
+ {{part.value}}
+ |
+
| {{property.label}} | +
+
+ {{part.value}}
+ |
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-header.html b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-header.html
index 8c59061788..e9f771f09c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/html/umb-box/umb-box-header.html
@@ -1,10 +1,13 @@
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
index bbf70f7a8e..13a5491184 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-editor.html
@@ -1,3 +1,3 @@
-
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.rollback.controller.js
deleted file mode 100644
index 9da43b1430..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.rollback.controller.js
+++ /dev/null
@@ -1,117 +0,0 @@
-(function () {
- "use strict";
-
- function ContentRollbackController($scope, assetsService) {
-
- var vm = this;
-
- vm.rollback = rollback;
- vm.loadVersion = loadVersion;
- vm.closeDialog = closeDialog;
-
- function onInit() {
-
- vm.loading = true;
- vm.variantVersions = [];
- vm.diff = null;
-
- // Load in diff library
- assetsService.loadJs('lib/jsdiff/diff.min.js', $scope).then(function () {
-
- var currentLanguage = $scope.currentNode.metaData.culture;
-
- vm.currentVersion = {
- "id": 1,
- "createDate": "22/08/2018 13.32",
- "name": "Forside",
- "properties": [
- {
- "alias": "headline",
- "label": "Headline",
- "value": "Velkommen"
- },
- {
- "alias": "text",
- "label": "Text",
- "value": "This is my danish Content"
- }
- ]
- };
-
- vm.previousVersions = [
- {
- "id": 2,
- "name": "Forside",
- "createDate": "21/08/2018 19.25"
- }
- ];
-
- vm.loading = false;
-
- });
-
- }
-
- function rollback() {
- console.log("rollback");
- }
-
- /**
- * This will load in a new version
- */
- function loadVersion(id) {
-
- // fake load version
- var currentLanguage = $scope.currentNode.metaData.culture;
-
- vm.diff = {};
- vm.diff.properties = [];
-
- var oldVersion = {
- "id": 2,
- "name": "Foride",
- "properties": [
- {
- "alias": "headline",
- "label": "Headline",
- "value": ""
- },
- {
- "alias": "text",
- "label": "Text",
- "value": "This is my danish Content Test"
- }
- ]
- };
-
- // find diff in name
- vm.diff.name = JsDiff.diffWords(vm.currentVersion.name, oldVersion.name);
-
- // find diff in properties
- angular.forEach(vm.currentVersion.properties,
- function(newProperty, index){
- var oldProperty = oldVersion.properties[index];
- var diffProperty = {
- "alias": newProperty.alias,
- "label": newProperty.label,
- "diff": JsDiff.diffWords(newProperty.value, oldProperty.value)
- };
- vm.diff.properties.push(diffProperty);
- });
-
- }
-
- /**
- * This will close the dialog
- */
- function closeDialog() {
- $scope.nav.hideDialog();
- }
-
- onInit();
-
- }
-
- angular.module("umbraco").controller("Umbraco.Editors.Content.RollbackController", ContentRollbackController);
-
-})();
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
index c7855651ec..8ca8b78b23 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
@@ -25,7 +25,7 @@
{{ variant.language.name }}
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/rollback.html b/src/Umbraco.Web.UI.Client/src/views/content/rollback.html
deleted file mode 100644
index 389b8f30db..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/content/rollback.html
+++ /dev/null
@@ -1,80 +0,0 @@
-
Language
+ ISO
Default
Mandatory
Fallback
@@ -42,6 +43,9 @@
{{ language.name }}
+
+ {{ language.culture }}
+
-
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 391b0f43e1..de52021220 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -349,6 +349,7 @@
Designer
diff --git a/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
index 79968939ec..1d397bfd01 100644
--- a/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Install/Views/Index.cshtml
@@ -45,7 +45,7 @@
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI/Umbraco/js/UmbracoSpeechBubbleBackEnd.js b/src/Umbraco.Web.UI/Umbraco/js/UmbracoSpeechBubbleBackEnd.js
index f0d041d37b..f738538f90 100644
--- a/src/Umbraco.Web.UI/Umbraco/js/UmbracoSpeechBubbleBackEnd.js
+++ b/src/Umbraco.Web.UI/Umbraco/js/UmbracoSpeechBubbleBackEnd.js
@@ -8,21 +8,21 @@ function UmbracoSpeechBubble(id) {
this.GenerateSpeechBubble();
}
-UmbracoSpeechBubble.prototype.GenerateSpeechBubble = function() {
+UmbracoSpeechBubble.prototype.GenerateSpeechBubble = function () {
var sbHtml = document.getElementById(this.id);
sbHtml.innerHTML = '' +
- '' +
- '();
-
+
+ ///
+ /// Gets the content apps collection builder.
+ ///
+ /// The composition.
+ /// ();
+
///
/// Gets the content finders collection builder.
///
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index adc2a78804..cce9a2d2ed 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1702,5 +1702,93 @@ namespace Umbraco.Web.Editors
Services.NotificationService.SetNotifications(Security.CurrentUser, content, notifyOptions);
}
+ [HttpGet]
+ public IEnumerable GetRollbackVersions(int contentId, string culture = null)
+ {
+ var rollbackVersions = new List();
+ var writerIds = new HashSet();
+
+ //Return a list of all versions of a specific content node
+ // fixme - cap at 50 versions for now?
+ var versions = Services.ContentService.GetVersionsSlim(contentId, 0, 50);
+
+ //Not all nodes are variants & thus culture can be null
+ if (culture != null)
+ {
+ //Get cultures that were published with the version = their update date is equal to the version's
+ versions = versions.Where(x => x.UpdateDate == x.GetUpdateDate(culture));
+ }
+
+ //First item is our current item/state (cant rollback to ourselves)
+ versions = versions.Skip(1);
+
+ foreach (var version in versions)
+ {
+ var rollbackVersion = new RollbackVersion
+ {
+ VersionId = version.VersionId,
+ VersionDate = version.UpdateDate,
+ VersionAuthorId = version.WriterId
+ };
+
+ rollbackVersions.Add(rollbackVersion);
+
+ writerIds.Add(version.WriterId);
+ }
+
+ var users = Services.UserService
+ .GetUsersById(writerIds.ToArray())
+ .ToDictionary(x => x.Id, x => x.Name);
+
+ foreach (var rollbackVersion in rollbackVersions)
+ {
+ if (users.TryGetValue(rollbackVersion.VersionAuthorId, out var userName))
+ rollbackVersion.VersionAuthorName = userName;
+ }
+
+ return rollbackVersions;
+ }
+
+ [HttpGet]
+ public ContentVariantDisplay GetRollbackVersion(int versionId, string culture = null)
+ {
+ var version = Services.ContentService.GetVersion(versionId);
+ var content = MapToDisplay(version);
+
+ return culture == null
+ ? content.Variants.FirstOrDefault() //No culture set - so this is an invariant node - so just list me the first item in here
+ : content.Variants.FirstOrDefault(x => x.Language.IsoCode == culture);
+ }
+
+ [HttpPost]
+ public HttpResponseMessage PostRollbackContent(int contentId, int versionId, string culture = "*")
+ {
+ var rollbackResult = Services.ContentService.Rollback(contentId, versionId, culture, Security.GetUserId().ResultOr(0));
+
+ if (rollbackResult.Success)
+ return Request.CreateResponse(HttpStatusCode.OK);
+
+ var notificationModel = new SimpleNotificationModel();
+
+ switch (rollbackResult.Result)
+ {
+ case OperationResultType.Failed:
+ case OperationResultType.FailedCannot:
+ case OperationResultType.FailedExceptionThrown:
+ case OperationResultType.NoOperation:
+ default:
+ notificationModel.AddErrorNotification(
+ Services.TextService.Localize("speechBubbles/operationFailedHeader"),
+ null); //TODO: There is no specific failed to save error message AFAIK
+ break;
+ case OperationResultType.FailedCancelledByEvent:
+ notificationModel.AddErrorNotification(
+ Services.TextService.Localize("speechBubbles/operationCancelledHeader"),
+ Services.TextService.Localize("speechBubbles/operationCancelledText"));
+ break;
+ }
+
+ return Request.CreateValidationErrorResponse(notificationModel);
+ }
}
}
diff --git a/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs b/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
index 33ceffe616..7d47139721 100644
--- a/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
@@ -19,13 +19,12 @@ namespace Umbraco.Web.Install.InstallSteps
{
get
{
- var currentVersion = UmbracoVersion.Local;
-
- //fixme - in this case there's a db but the version is cleared which is fine and a normal way to force the upgrader
- // to execute, but before we would detect the current version via the DB like DatabaseSchemaResult.DetermineInstalledVersion
- // what now, do we need to?
- if (currentVersion == null)
- currentVersion = new Semver.SemVersion(0);
+ // fixme - if UmbracoVersion.Local is null?
+ // it means that there is a database but the web.config version is cleared
+ // that was a "normal" way to force the upgrader to execute, and we would detect the current
+ // version via the DB like DatabaseSchemaResult.DetermineInstalledVersion - magic, do we really
+ // need this now?
+ var currentVersion = (UmbracoVersion.Local ?? new Semver.SemVersion(0)).ToString();
var newVersion = UmbracoVersion.SemanticVersion.ToString();
diff --git a/src/Umbraco.Web/Models/ContentEditing/RollbackVersion.cs b/src/Umbraco.Web/Models/ContentEditing/RollbackVersion.cs
new file mode 100644
index 0000000000..dad1341a8c
--- /dev/null
+++ b/src/Umbraco.Web/Models/ContentEditing/RollbackVersion.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+ [DataContract(Name = "rollbackVersion", Namespace = "")]
+ public class RollbackVersion
+ {
+ [DataMember(Name = "versionId")]
+ public int VersionId { get; set; }
+
+ [DataMember(Name = "versionDate")]
+ public DateTime VersionDate { get; set; }
+
+ [DataMember(Name = "versionAuthorId")]
+ public int VersionAuthorId { get; set; }
+
+ [DataMember(Name = "versionAuthorName")]
+ public string VersionAuthorName { get; set; }
+ }
+}
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index e414e69607..d04bb1c83b 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -238,7 +238,6 @@ namespace Umbraco.Web.Trees
AddActionNode(item, menu, true);
- AddActionNode(item, menu);
AddActionNode(item, menu, convert: true);
AddActionNode(item, menu);
AddActionNode(item, menu, convert: true);
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index dbdfce132a..6b4273e829 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -147,6 +147,7 @@
editPackage.aspx
-
- rollBack.aspx
-
-
- rollBack.aspx
-
ASPXCodeBehind
-
- ASPXCodeBehind
-
umbraco_org_umbraco_update_CheckForUpgrade
-
-
+
-
-
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/languages/overview.html b/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
index 735bf16d94..dfec56fbc0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/languages/overview.html
@@ -31,6 +31,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Rollback {{ currentNode.name }}
- -{{vm.currentVersion.name}} (Created: {{vm.currentVersion.createDate}})
- -
-
-
-
-
-
-
-
- Changes
-| Name | -
-
- {{part.value}}
- |
-
| {{property.label}} | -
-
- {{part.value}}
- |
-
Did you know
- +{{installer.feedback}}
diff --git a/src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx b/src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx deleted file mode 100644 index 84b2cc5cb8..0000000000 --- a/src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx +++ /dev/null @@ -1,98 +0,0 @@ -<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master"AutoEventWireup="True" Inherits="umbraco.presentation.dialogs.rollBack" %> - -<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %> - -
-
-
-
-
-
-
-
-
-
- Diff
- Html
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
' +
- '![]()
' +
- ' 
' +
- '
' + - '
' +
- ''
-}
+ '' +
+ '' +
- ' The header!
' + - 'Default Text Container!
' + - '
' +
+ '![]()
' +
+ ' ' +
+ '
' + + '
' +
+ '';
+};
UmbracoSpeechBubble.prototype.ShowMessage = function (icon, header, message, dontAutoHide) {
var speechBubble = jQuery("#" + this.id);
@@ -46,7 +46,7 @@ UmbracoSpeechBubble.prototype.ShowMessage = function (icon, header, message, don
jQuery(".speechClose").show();
}
}
-}
+};
UmbracoSpeechBubble.prototype.Hide = function () {
if (!this.ie) {
@@ -54,7 +54,7 @@ UmbracoSpeechBubble.prototype.Hide = function () {
} else {
jQuery("#" + this.id).hide();
}
-}
+};
// Initialize
var UmbSpeechBubble = null
@@ -65,4 +65,4 @@ function InitUmbracoSpeechBubble() {
jQuery(document).ready(function() {
InitUmbracoSpeechBubble();
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs
index 332380009d..f33c8e98a8 100644
--- a/src/Umbraco.Web/CompositionExtensions.cs
+++ b/src/Umbraco.Web/CompositionExtensions.cs
@@ -10,6 +10,7 @@ using Umbraco.Web.Mvc;
using Umbraco.Web.PublishedCache;
using Umbraco.Web.Routing;
using Umbraco.Web._Legacy.Actions;
+using Umbraco.Web.ContentApps;
// the namespace here is intentional - although defined in Umbraco.Web assembly,
// this class should be visible when using Umbraco.Core.Components, alongside
@@ -32,7 +33,15 @@ namespace Umbraco.Core.Components
/// ' +
+ ' The header!
' + + 'Default Text Container!
' + + '