From 7769a0ba4206679cb01cd0772e92712beaf67eea Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 1 Aug 2017 11:19:31 +1000
Subject: [PATCH] Updates logic to show if the user or group has not start
 nodes defined (which does not anymore indicate root access)

---
 .../directives/components/umbnodepreview.directive.js      | 7 +++++--
 .../src/views/components/umb-node-preview.html             | 2 +-
 .../src/views/components/users/umb-user-group-preview.html | 6 ++++--
 .../src/views/users/group.controller.js                    | 7 +++++++
 src/Umbraco.Web.UI.Client/src/views/users/group.html       | 4 ++--
 .../src/views/users/user.controller.js                     | 4 ++++
 src/Umbraco.Web.UI.Client/src/views/users/user.html        | 3 +--
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml              | 1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml           | 1 +
 9 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
index e935557ce9..a326c0f697 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
@@ -94,7 +94,9 @@
     function NodePreviewDirective() {
 
         function link(scope, el, attr, ctrl) {
-
+            if (!scope.editLabelKey) {
+                scope.editLabelKey = "general_edit";
+            }
         }
 
         var directive = {
@@ -113,7 +115,8 @@
                 allowEdit: "=?",
                 onOpen: "&?",
                 onRemove: "&?",
-                onEdit: "&?"
+                onEdit: "&?",
+                editLabelKey: "=?"
             },
             link: link
         };
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
index b03f4b40c8..c77fadbe34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
@@ -13,7 +13,7 @@
         </div>
     </div>
     <div class="umb-node-preview__actions">
-        <a class="umb-node-preview__action" title="Open" href="" ng-if="allowEdit"  ng-click="onEdit()"><localize key="general_edit">Edit</localize></a>
+        <a class="umb-node-preview__action" title="Open" href="" ng-if="allowEdit"  ng-click="onEdit()"><localize key="{{editLabelKey}}">Edit</localize></a>
         <a class="umb-node-preview__action" title="Open" href="" ng-if="allowOpen"  ng-click="onOpen()"><localize key="general_open">Open</localize></a>
         <a class="umb-node-preview__action umb-node-preview__action--red" title="Remove" href="" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></i></a>
     <div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
index f736014772..3fc2761558 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
@@ -16,16 +16,18 @@
         <div class="umb-user-group-preview__permission">
             <span>
                 <span class="bold">Content start node:</span>
+                <span ng-if="!contentStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
                 <span ng-if="contentStartNode && contentStartNode != -1">{{ contentStartNode.name }}</span>
-                <span ng-if="contentStartNode == -1 || !contentStartNode">Content Root</span>
+                <span ng-if="contentStartNode == -1">Content root</span>
             </span>
         </div>
         
         <div class="umb-user-group-preview__permission">
             <span>
                 <span class="bold">Media start node:</span>
+                <span ng-if="!mediaStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
                 <span ng-if="mediaStartNode && mediaStartNode != -1">{{ mediaStartNode.name }}</span>
-                <span ng-if="mediaStartNode == -1 || !mediaStartNode">Media Root</span>
+                <span ng-if="mediaStartNode == -1">Media root</span>
             </span>
         </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
index 01364d29d1..7c17952966 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
@@ -6,6 +6,7 @@
         var vm = this;
         var localizeSaving = localizationService.localize("general_saving");
 
+
         vm.page = {};
         vm.page.contentRootLabel = "Content Root";
         vm.page.mediaRootLabel = "Media Root";
@@ -31,6 +32,12 @@
             localizationService.localize("general_cancel").then(function (name) {
                 vm.labels.cancel = name;
             });
+            localizationService.localize("general_add").then(function (name) {
+                vm.labels.add = name;
+            });
+            localizationService.localize("user_noStartNode").then(function (name) {
+                vm.labels.noStartNode = name;
+            });
 
             if ($routeParams.create) {
                 // get user group scaffold
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html
index d10bab1cc7..8cc06698aa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html
@@ -59,9 +59,9 @@
                                         <umb-node-preview
                                             ng-if="!vm.userGroup.contentStartNode"
                                             style="max-width: 100%;"
-                                            icon="vm.page.rootIcon"
-                                            name="vm.page.contentRootLabel"
+                                            name="vm.labels.noStartNode"
                                             allow-edit="true"
+                                            edit-label-key="'general_add'"
                                             on-edit="vm.openContentPicker()">
                                         </umb-node-preview>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
index c85915ab67..0887234084 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
@@ -39,6 +39,10 @@
 
             vm.loading = true;
 
+            localizationService.localize("user_noStartNode").then(function (name) {
+                vm.page.noStartNodeLabel = name;
+            });
+
             // get user
             usersResource.getUser($routeParams.id).then(function (user) {
                 vm.user = user;
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.html b/src/Umbraco.Web.UI.Client/src/views/users/user.html
index 52eb5e7871..2c15110367 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.html
@@ -142,8 +142,7 @@
                     <umb-node-preview
                       ng-if="vm.user.startMediaIds.length === 0"
                       style="max-width: 100%;"
-                      icon="vm.page.rootIcon"
-                      name="vm.page.mediaRootLabel"
+                      name="vm.page.noStartNodeLabel"
                       allow-remove="false">
                     </umb-node-preview>
 
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 2bf100bdda..d29041d3c3 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -1604,6 +1604,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="permissionSelectPages">Select pages to modify their permissions</key>
     <key alias="searchAllChildren">Search all children</key>
     <key alias="startnode">Start Node in Content</key>
+    <key alias="noStartNode">No start node selected</key>
     <key alias="username">Name</key>
     <key alias="userPermissions">User permissions</key>
     <key alias="userGroupPermissions">User group permissions</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index d845a8482a..d3b3e4cc48 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -1502,6 +1502,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="removePhoto">Remove photo</key>
     <key alias="searchAllChildren">Search all children</key>
     <key alias="startnode">Start Node in Content</key>
+    <key alias="noStartNode">No start node selected</key>
     <key alias="username">Name</key>
     <key alias="userPermissions">User permissions</key>
     <key alias="userGroupPermissions">User group permissions</key>