Fixes: U4-7474 rename member tree path + set header name not to be locked

src/Umbraco.Web.UI.Client/src/views/member/edit.html

@@ -11,7 +11,6 @@
 
          <umb-editor-header
             name="content.name"
-            name-locked="page.nameLocked"
             tabs="content.tabs"
             menu="page.menu"
             hide-icon="true"

src/Umbraco.Web.UI.Client/src/views/member/list.html

@@ -2,7 +2,7 @@
 
    <umb-load-indicator ng-if="page.loading"></umb-load-indicator>
 
-   <form novalidate name="contentForm" ng-show="!page.loading">
+   <form novalidate name="contentForm" ng-show="!page.loading" val-form-manager>
 
       <umb-editor-view umb-tabs>
 

src/Umbraco.Web.UI.Client/src/views/member/member.delete.controller.js

@@ -20,7 +20,7 @@ function MemberDeleteController($scope, memberResource, treeService, navigationS
 
             //if the current edited item is the same one as we're deleting, we need to navigate elsewhere
             if (editorState.current && editorState.current.key == $scope.currentNode.id) {
-                $location.path("/member/members/list/" + ($routeParams.listName ? $routeParams.listName : 'all-members'));
+                $location.path("/member/member/list/" + ($routeParams.listName ? $routeParams.listName : 'all-members'));
             }
 
             navigationService.hideMenu();

src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js

@@ -10,16 +10,17 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
 
     //setup scope vars
     $scope.page = {};
-    $scope.page.loading = false;
+    $scope.page.loading = true;
     $scope.page.menu = {};
     $scope.page.menu.currentSection = appState.getSectionState("currentSection");
     $scope.page.menu.currentNode = null; //the editors affiliated node
     $scope.page.nameLocked = false;
     $scope.page.listViewPath = null;
     $scope.page.saveButtonState = "init";
+    $scope.busy = false;
 
     $scope.page.listViewPath = ($routeParams.page && $routeParams.listName)
-        ? "/member/members/list/" + $routeParams.listName + "?page=" + $routeParams.page
+        ? "/member/member/list/" + $routeParams.listName + "?page=" + $routeParams.page
         : null;
 
     //build a path to sync the tree with
@@ -33,8 +34,6 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
         // we are not using the umbraco membership provider
         if ($routeParams.doctype) {
 
-           $scope.page.loading = true;
-
             //we are creating so get an empty member item
             memberResource.getScaffold($routeParams.doctype)
                 .then(function(data) {
@@ -51,8 +50,6 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
         }
         else {
 
-           $scope.page.loading = true;
-
             memberResource.getScaffold()
                 .then(function (data) {
                     $scope.content = data;
@@ -75,14 +72,13 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
         //TODO: Why is this here - I don't understand why this would ever be an integer? This will not work when we support non-umbraco membership providers.
 
         if ($routeParams.id && $routeParams.id.length < 9) {
+
             entityResource.getById($routeParams.id, "Member").then(function(entity) {
-                $location.path("/member/members/edit/" + entity.key);
+                $location.path("/member/member/edit/" + entity.key);
             });
         }
         else {
 
-           $scope.page.loading = true;
-
             //we are editing so get the content item from the server
             memberResource.getByKey($routeParams.id)
                 .then(function(data) {
@@ -96,7 +92,7 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
                     var path = buildTreePath(data);
 
                     //sync the tree (only for ui purposes)
-                    navigationService.syncTree({ tree: "members", path: path.split(",") });
+                    navigationService.syncTree({ tree: "member", path: path.split(",") });
 
                     //it's the initial load of the editor, we need to get the tree node
                     // from the server so that we can load in the actions menu.
@@ -154,7 +150,7 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS
                     var path = buildTreePath(data);
 
                     //sync the tree (only for ui purposes)
-                    navigationService.syncTree({ tree: "members", path: path.split(","), forceReload: true });
+                    navigationService.syncTree({ tree: "member", path: path.split(","), forceReload: true });
 
             }, function (err) {
 

src/Umbraco.Web.UI.Client/src/views/member/member.list.controller.js

@@ -31,7 +31,7 @@ function MemberListController($scope, $routeParams, $location, $q, $window, appS
 
             editorState.set($scope.content);
 
-            navigationService.syncTree({ tree: "members", path: data.path.split(",") }).then(function (syncArgs) {
+            navigationService.syncTree({ tree: "member", path: data.path.split(",") }).then(function (syncArgs) {
                 $scope.currentNode = syncArgs.node;
             });