yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/temp-U4-10299' into dev-v7.7

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Trees/LegacyTreeParams.cs
This commit is contained in:
Shannon
2017-08-18 14:11:41 +10:00
parent 7184838546 ff29493203
commit 1fc49ccf59
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
View File

@@ -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);
});
});

15
src/Umbraco.Web/Trees/LegacyTreeParams.cs
View File

@@ -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; }

2
src/Umbraco.Web/Trees/UserTreeController.cs
View File

@@ -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]