From c18c936820bd226cc043bc449d04bf0b25a1de25 Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lea@markedspartner.no>
Date: Thu, 3 Nov 2016 16:18:26 +0100
Subject: [PATCH] Per-approved re-usability. Only issue is controller being
 under documenttypes.

---
 .../views/documenttypes/rename.controller.js  | 21 ++++++------
 .../src/views/documenttypes/rename.html       | 32 +++++++++----------
 .../src/views/mediatypes/rename.html          | 32 +++++++++----------
 3 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.controller.js
index fd0445965e..49e9591496 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.controller.js
@@ -7,17 +7,16 @@
         "notificationsService",
         "localizationService",
         function (scope, injector, navigationService, notificationsService, localizationService) {
-            var notificationHeader,
-                resource = injector.get(scope.resource);
+            var notificationHeader;
 
-            function reportSuccessAndClose() {
+            function reportSuccessAndClose(treeName) {
                 var lastComma = scope.currentNode.path.lastIndexOf(","),
                     path = lastComma === -1
                         ? scope.currentNode.path
                         : scope.currentNode.path.substring(0, lastComma - 1);
 
                 navigationService.syncTree({
-                    tree: scope.tree,
+                    tree: treeName,
                     path: path,
                     forceReload: true,
                     activate: true
@@ -37,18 +36,20 @@
                 navigationService.hideMenu();
             }
 
-
             localizationService.localize("renamecontainer_renamed")
-                .then(function(s) { notificationHeader = s; });
+                .then(function (s) { notificationHeader = s; });
 
             scope.model = {
-                folderName: scope.currentNode.name 
+                folderName: scope.currentNode.name
             }
 
-            scope.renameContainer = function () {
+            scope.renameContainer = function (resourceKey, treeName) {
+                var resource = injector.get(resourceKey);
 
                 resource.renameContainer(scope.currentNode.id, scope.model.folderName)
-                    .then(reportSuccessAndClose, function (err) {
+                    .then(function () {
+                        reportSuccessAndClose(treeName);
+                    }, function (err) {
                         scope.error = err;
 
                         if (angular.isArray(err.data.notifications)) {
@@ -57,8 +58,6 @@
                             }
                         }
                     });
-
             }
-
         }
     ]);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html
index 60509513f7..f739cadb71 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/rename.html
@@ -1,24 +1,22 @@
-<div ng-init="resource = 'contentTypeResource'; tree = 'documenttypes'">
-    <div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.ContentTypeContainers.RenameController" ng-cloak>
+<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.ContentTypeContainers.RenameController" ng-cloak>
 
-        <div class="umb-pane">
-            <form novalidate name="renameFolderForm"
-                  ng-submit="renameContainer()"
-                  val-form-manager>
+    <div class="umb-pane">
+        <form novalidate name="renameFolderForm"
+              ng-submit="renameContainer('contentTypeResource', 'documenttypes')"
+              val-form-manager>
 
-                <div ng-show="error">
-                    <h5 class="text-error">{{error.errorMsg}}</h5>
-                    <p class="text-error">{{error.data.message}}</p>
-                </div>
+            <div ng-show="error">
+                <h5 class="text-error">{{error.errorMsg}}</h5>
+                <p class="text-error">{{error.data.message}}</p>
+            </div>
 
-                <umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
-                    <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
-                </umb-control-group>
-
-                <button type="submit" class="btn btn-primary"><localize key="general_rename">Rename</localize></button>
-            </form>
-        </div>
+            <umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
+                <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+            </umb-control-group>
 
+            <button type="submit" class="btn btn-primary"><localize key="general_rename">Rename</localize></button>
+        </form>
     </div>
 
 </div>
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/rename.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/rename.html
index 257f61be9a..5f027cf607 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/rename.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/rename.html
@@ -1,23 +1,21 @@
-<div ng-init="resource = 'mediaTypeResource'; tree = 'mediatypes'">
-    <div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.ContentTypeContainers.RenameController" ng-cloak>
+<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.ContentTypeContainers.RenameController" ng-cloak>
 
-        <div class="umb-pane">
-            <form novalidate name="renameFolderForm"
-                  ng-submit="renameContainer()"
-                  val-form-manager>
+    <div class="umb-pane">
+        <form novalidate name="renameFolderForm"
+              ng-submit="renameContainer('mediaTypeResource', 'mediatypes')"
+              val-form-manager>
 
-                <div ng-show="error">
-                    <h5 class="text-error">{{error.errorMsg}}</h5>
-                    <p class="text-error">{{error.data.message}}</p>
-                </div>
+            <div ng-show="error">
+                <h5 class="text-error">{{error.errorMsg}}</h5>
+                <p class="text-error">{{error.data.message}}</p>
+            </div>
 
-                <umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
-                    <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
-                </umb-control-group>
-
-                <button type="submit" class="btn btn-primary"><localize key="general_rename">Rename</localize></button>
-            </form>
-        </div>
+            <umb-control-group label="@renamecontainer_enterNewFolderName" hide-label="false">
+                <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+            </umb-control-group>
 
+            <button type="submit" class="btn btn-primary"><localize key="general_rename">Rename</localize></button>
+        </form>
     </div>
+
 </div>