From 858c21c79fb030535ddbdc610a7955a8ec82127b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 8 Sep 2017 14:28:18 +1000
Subject: [PATCH] Ensures Content header node isn't shown in copy/move dialogs
 when the user has a start node set that is not the root

---
 src/Umbraco.Web.UI.Client/src/less/tree.less           |  1 +
 .../src/views/common/overlays/user/user.controller.js  |  4 ++--
 .../src/views/content/content.copy.controller.js       |  8 +++++++-
 .../src/views/content/content.move.controller.js       | 10 ++++++++--
 src/Umbraco.Web.UI.Client/src/views/content/copy.html  |  2 +-
 src/Umbraco.Web.UI.Client/src/views/content/move.html  |  2 +-
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less
index 045a741e90..c859fae991 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tree.less
@@ -378,6 +378,7 @@ div.locked:before{
 }
 
 .umb-tree li div.no-access .umb-tree-icon,
+.umb-tree li div.no-access .root-link,
 .umb-tree li div.no-access .umb-tree-item__label {
 	color: @gray-7;
 	cursor: not-allowed;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
index 6820e81f31..b18aa96588 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
@@ -169,10 +169,10 @@ angular.module("umbraco")
            $scope.showPasswordFields = !$scope.showPasswordFields;
         }
 
-        function clearPasswordFields() {
+        function clearPasswordFields() { 
            $scope.changePasswordModel.value.oldPassword = "";
            $scope.changePasswordModel.value.newPassword = "";
            $scope.changePasswordModel.value.confirm = "";
         }
-
+         
     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
index 9940aebe64..0e28a09236 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
@@ -1,5 +1,5 @@
 angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
-	function ($scope, eventsService, contentResource, navigationService, appState, treeService, localizationService, notificationsService) {
+    function ($scope, userService, eventsService, contentResource, navigationService, appState, treeService, localizationService, notificationsService) {
 
 	    var dialogOptions = $scope.dialogOptions;
 	    var searchText = "Search...";
@@ -18,6 +18,12 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
 	        results: [],
 	        selectedSearchResults: []
 	    }
+	    $scope.treeModel = {
+	        hideHeader: false
+	    }
+	    userService.getCurrentUser().then(function (userData) {
+	        $scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1;
+	    });
 
 	    var node = dialogOptions.currentNode;
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
index ce81a60a38..984c147ee4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
@@ -1,5 +1,5 @@
 angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
-	function ($scope, eventsService, contentResource, navigationService, appState, treeService, localizationService, notificationsService) {
+	function ($scope, userService, eventsService, contentResource, navigationService, appState, treeService, localizationService, notificationsService) {
 
 	    var dialogOptions = $scope.dialogOptions;
 	    var searchText = "Search...";
@@ -15,7 +15,13 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
 	        showSearch: false,
 	        results: [],
 	        selectedSearchResults: []
-	    }
+        }
+        $scope.treeModel = {
+            hideHeader: false
+        }
+        userService.getCurrentUser().then(function (userData) {
+            $scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1;
+        });
 
 	    var node = dialogOptions.currentNode;
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
index c19ec72dbd..0248dd7d92 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
@@ -48,7 +48,7 @@
                     <div ng-hide="searchInfo.showSearch">
                         <umb-tree
                             section="content"
-                            hideheader="false"
+                            hideheader="treeModel.hideHeader"
                             hideoptions="true"
                             isdialog="true"
                             eventhandler="dialogTreeEventHandler"
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/move.html b/src/Umbraco.Web.UI.Client/src/views/content/move.html
index 964e4d548c..6a4154b46c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/move.html
@@ -49,7 +49,7 @@
                     <div ng-hide="searchInfo.showSearch">
                         <umb-tree 
                             section="content"
-                            hideheader="false"
+                            hideheader="treeModel.hideHeader"
                             hideoptions="true"
                             isdialog="true"
                             eventhandler="dialogTreeEventHandler"