From eb8b2698460eaf9766a2aa438093a90c5e725aae Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 17 Oct 2018 16:02:47 +0200 Subject: [PATCH] wire up getRollbackVersion endpoint --- .../src/common/resources/content.resource.js | 33 +++++++++++++++++++ .../rollback/rollback.controller.js | 9 +++-- .../infiniteeditors/rollback/rollback.html | 2 +- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js index 6c0cb5e6b2..34a61cca91 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js @@ -840,9 +840,42 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) { ), "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)
+          *    .then(function(version) {
+          *        alert('its here!');
+          *    });
+          * 
+ * + * @param {Int} versionId The version Id + * @returns {Promise} resourcePromise object containing the url. + * + */ + getRollbackVersion: function (versionId) { + return umbRequestHelper.resourcePromise( + $http.get( + umbRequestHelper.getApiUrl("contentApiBaseUrl", "GetRollbackVersion", { + versionId: versionId + }) + ), + "Failed to get version for content item with id " + versionId + ); } + }; } 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 cbbc4dd182..24fab8f30a 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 @@ -6,7 +6,6 @@ var vm = this; vm.rollback = rollback; - vm.loadVersion = loadVersion; vm.changeLanguage = changeLanguage; vm.changeVersion = changeVersion; vm.submit = submit; @@ -64,6 +63,12 @@ function changeVersion(version) { console.log("version", version); + contentResource.getRollbackVersion(version.versionId) + .then(function(data){ + console.log(data); + //createDiff(vm.currentVersion, data); + }); + } function getVersions() { @@ -85,7 +90,7 @@ /** * This will load in a new version */ - function loadVersion(id) { + function createDiff(currentVersion, previousVersion) { // fake load version 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 6a17cac09b..70dd189328 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 @@ -40,7 +40,7 @@ class="input-block-level" ng-model="vm.selectedVersion" ng-options="version.versionDate for version in vm.previousVersions track by version.versionId" - ng-change="vm.changeVersion(vm.selectedVersion.id)"> + ng-change="vm.changeVersion(vm.selectedVersion)">