From 3885454b265e2350670b2363d4d1afd159b43678 Mon Sep 17 00:00:00 2001 From: Claus Date: Wed, 16 Aug 2017 13:42:19 +0200 Subject: [PATCH 1/3] updating name of usersResource for v. 7.7 --- src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); }); }); From 5fff88479822289bdadcca33e12820e8d88aff13 Mon Sep 17 00:00:00 2001 From: Claus Date: Wed, 16 Aug 2017 13:43:21 +0200 Subject: [PATCH 2/3] making sure title is added to trees.config - not sure if its needed but lets just do it. --- src/Umbraco.Web/Trees/UserTreeController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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] From ff29493203a1e836b0664c8f1c49945d9a52f930 Mon Sep 17 00:00:00 2001 From: Claus Date: Wed, 16 Aug 2017 13:43:48 +0200 Subject: [PATCH 3/3] missing null check causing legacy trees to break if theres no querystring data. --- src/Umbraco.Web/Trees/LegacyTreeParams.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web/Trees/LegacyTreeParams.cs b/src/Umbraco.Web/Trees/LegacyTreeParams.cs index bf905a6f4c..09124e8689 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeParams.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeParams.cs @@ -15,13 +15,16 @@ namespace Umbraco.Web.Trees public LegacyTreeParams(IEnumerable> formCollection) { - 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; + if (formCollection != null) + { + 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; }