diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js b/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js index bc5980c7cb..259002448c 100644 --- a/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js +++ b/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js @@ -179,7 +179,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Application"); var injector = getRootInjector(); var navService = injector.get("navigationService"); var localizationService = injector.get("localizationService"); - var userResource = injector.get("userResource"); + var usersResource = injector.get("usersResource"); //var appState = injector.get("appState"); var angularHelper = injector.get("angularHelper"); var $rootScope = injector.get("$rootScope"); @@ -194,7 +194,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Application"); if (currentMenuNode) { if (confirm(txtConfirmDisable + ' "' + UmbClientMgr.mainTree().getActionNode().nodeName + '"?\n\n')) { angularHelper.safeApply($rootScope, function () { - usersResource.disableUser(currentMenuNode.nodeId).then(function () { + usersResource.disableUsers(currentMenuNode.nodeId).then(function () { UmbClientMgr.mainTree().syncTree("-1," + currentMenuNode.nodeId, true); }); }); diff --git a/src/Umbraco.Web/Trees/LegacyTreeParams.cs b/src/Umbraco.Web/Trees/LegacyTreeParams.cs index 0f4d18a3f2..474ecb6580 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeParams.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeParams.cs @@ -17,15 +17,14 @@ namespace Umbraco.Web.Trees { if (formCollection == null) { - return; + var p = TreeRequestParams.FromDictionary(formCollection.ToDictionary(x => x.Key, x => x.Value)); + NodeKey = p.NodeKey; + StartNodeID = p.StartNodeID; + ShowContextMenu = p.ShowContextMenu; + IsDialog = p.IsDialog; + DialogMode = p.DialogMode; + FunctionToCall = p.FunctionToCall; } - var p = TreeRequestParams.FromDictionary(formCollection.ToDictionary(x => x.Key, x => x.Value)); - NodeKey = p.NodeKey; - StartNodeID = p.StartNodeID; - ShowContextMenu = p.ShowContextMenu; - IsDialog = p.IsDialog; - DialogMode = p.DialogMode; - FunctionToCall = p.FunctionToCall; } public string NodeKey { get; set; } diff --git a/src/Umbraco.Web/Trees/UserTreeController.cs b/src/Umbraco.Web/Trees/UserTreeController.cs index 8b70be9c95..13f42d200b 100644 --- a/src/Umbraco.Web/Trees/UserTreeController.cs +++ b/src/Umbraco.Web/Trees/UserTreeController.cs @@ -8,7 +8,7 @@ using Constants = Umbraco.Core.Constants; namespace Umbraco.Web.Trees { [UmbracoTreeAuthorize(Constants.Trees.Users)] - [Tree(Constants.Applications.Users, Constants.Trees.Users, null, sortOrder: 0)] + [Tree(Constants.Applications.Users, Constants.Trees.Users, "Users", sortOrder: 0)] [PluginController("UmbracoTrees")] [LegacyBaseTree(typeof(loadUsers))] [CoreTree]