From 5944cec8fc4ff4ad38f30f8b1efb91a223e3a782 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 26 Nov 2018 22:22:48 +0100
Subject: [PATCH] Fix and clean up the restore content dialog

---
 .../content/content.restore.controller.js     | 69 ++++++++++++-------
 .../src/views/content/restore.html            | 32 +++++----
 2 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
index 53651a83df..859e6281c0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
@@ -1,49 +1,58 @@
 angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController",
-    function ($scope, relationResource, contentResource, navigationService, appState, treeService, localizationService) {
+    function ($scope, relationResource, contentResource, entityResource, navigationService, appState, treeService, localizationService) {
 
-		var node = $scope.currentNode;
+        $scope.source = _.clone($scope.currentNode);
 
 		$scope.error = null;
-	    $scope.success = false;
+        $scope.success = false;
+        $scope.loading = true;
 
-		relationResource.getByChildId(node.id, "relateParentDocumentOnDelete").then(function (data) {
+        relationResource.getByChildId($scope.source.id, "relateParentDocumentOnDelete").then(function (data) {
+            $scope.loading = false;
 
-            if (data.length == 0) {
-                $scope.success = false;
-                $scope.error = {
-                    errorMsg: localizationService.localize('recycleBin_itemCannotBeRestored'),
-                    data: {
-                        Message: localizationService.localize('recycleBin_noRestoreRelation')
-                    }
-                }
+            if (!data.length) {
+                localizationService.localizeMany(["recycleBin_itemCannotBeRestored", "recycleBin_noRestoreRelation"])
+                    .then(function(values) {
+                        $scope.success = false;
+                        $scope.error = {
+                            errorMsg: values[0],
+                            data: {
+                                Message: values[1]
+                            }
+                        }
+                    });
                 return;
             }
 
 		    $scope.relation = data[0];
 
-			if ($scope.relation.parentId == -1) {
+			if ($scope.relation.parentId === -1) {
 				$scope.target = { id: -1, name: "Root" };
 
-			} else {
-			    contentResource.getById($scope.relation.parentId).then(function (data) {
+            } else {
+			    $scope.loading = true;
+                entityResource.getById($scope.relation.parentId, "Document").then(function (data) {
+                    $scope.loading = false;
 					$scope.target = data;
-
 					// make sure the target item isn't in the recycle bin
 					if($scope.target.path.indexOf("-20") !== -1) {
-						$scope.error = {
-                            errorMsg: localizationService.localize('recycleBin_itemCannotBeRestored'),
-							data: {
-                                Message: localizationService.localize('recycleBin_restoreUnderRecycled').then(function (value) {
-                                    value.replace('%0%', $scope.target.name);
-                                })
-							}
-						};
+                        localizationService.localizeMany(["recycleBin_itemCannotBeRestored", "recycleBin_restoreUnderRecycled"])
+					        .then(function (values) {
+					            $scope.success = false;
+					            $scope.error = {
+					                errorMsg: values[0],
+					                data: {
+                                        Message: values[1].replace('%0%', $scope.target.name)
+					                }
+					            }
+					        });
 						$scope.success = false;
 					}
 
 				}, function (err) {
 					$scope.success = false;
 					$scope.error = err;
+                    $scope.loading = false;
 				});
 			}
 
@@ -53,10 +62,12 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController"
 		});
 
 		$scope.restore = function () {
+		    $scope.loading = true;
 			// this code was copied from `content.move.controller.js`
-			contentResource.move({ parentId: $scope.target.id, id: node.id })
+            contentResource.move({ parentId: $scope.target.id, id: $scope.source.id })
 				.then(function (path) {
 
+                    $scope.loading = false;
 					$scope.success = true;
 
 					//first we need to remove the node that launched the dialog
@@ -79,6 +90,12 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController"
 				}, function (err) {
 					$scope.success = false;
 					$scope.error = err;
+                    $scope.loading = false;
 				});
-		};
+        };
+
+        $scope.close = function () {
+            navigationService.hideDialog();
+        };
+
 	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/restore.html b/src/Umbraco.Web.UI.Client/src/views/content/restore.html
index e99e2eb251..1880f9447f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/restore.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/restore.html
@@ -2,25 +2,33 @@
 	<div class="umb-dialog-body">
 		<umb-pane>
 
-            <p class="abstract" ng-hide="error != null || success == true">
-                <localize key="actions_restore">Restore</localize> <strong>{{currentNode.name}}</strong> <localize key="general_under">under</localize> <strong>{{target.name}}</strong>?
+		    <umb-load-indicator
+		        ng-show="loading">
+		    </umb-load-indicator>
+
+		    <p class="abstract" ng-hide="loading || error != null || success">
+                <localize key="actions_restore">Restore</localize> <strong>{{source.name}}</strong> <localize key="general_under">under</localize> <strong>{{target.name}}</strong>?
             </p>
 
-			<div class="alert alert-error" ng-show="error != null">
-				<div><strong>{{error.errorMsg}}</strong></div>
-				<div>{{error.data.Message}}</div>
-			</div>
+		    <div ng-show="error">
+		        <div class="alert alert-error">
+		            <div><strong>{{error.errorMsg}}</strong></div>
+		            <div>{{error.data.Message}}</div>
+		        </div>
+		    </div>
 
-			<div class="alert alert-success" ng-show="success == true">
-				<p><strong>{{currentNode.name}}</strong> <localize key="editdatatype_wasMoved">was moved underneath</localize> <strong>{{target.name}}</strong></p>
-				<button class="btn btn-primary" ng-click="nav.hideDialog()"><localize key="general_ok">OK</localize></button>
-			</div>
+		    <div ng-show="success">
+		        <div class="alert alert-success">
+                    <strong>{{source.name}}</strong> was moved underneath&nbsp;<strong>{{target.name}}</strong>
+		        </div>
+		        <button class="btn btn-primary" ng-click="close()">Ok</button>
+		    </div>
 
 		</umb-pane>
 	</div>
 
-	<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success == true">
-		<a class="btn btn-link" ng-click="nav.hideDialog()"><localize key="general_cancel">Cancel</localize></a>
+	<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || success">
+		<a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
 		<button class="btn btn-primary" ng-click="restore()" ng-show="error == null"><localize key="actions_restore">Restore</localize></button>
 	</div>
 </div>