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

Refactors how the 'OpensDialog' gets assigned to menu items, fixes permission check on rollback

Browse Source
This commit is contained in:
Shannon
2018-10-30 00:34:43 +11:00
parent b8a65febf4
commit 77f4f0bbad
19 changed files with 89 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web/Trees/MemberTreeController.cs
View File

@@ -159,17 +159,16 @@ namespace Umbraco.Web.Trees
menu.DefaultMenuAlias = ActionNew.ActionAlias;
//Create the normal create action
menu.Items.Add<ActionNew>(Services.TextService);
menu.Items.Add<ActionNew>(Services.TextService, opensDialog: true);
}
else
{
//Create a custom create action - this does not launch a dialog, it just navigates to the create screen
// we'll create it based on the ActionNew so it maintains the same icon properties, name, etc...
var createMenuItem = new MenuItem
var createMenuItem = new MenuItem(ActionNew.ActionAlias, Services.TextService)
{
Name = Services.TextService.Localize($"actions/{ActionNew.ActionAlias}"),
Alias = ActionNew.ActionAlias,
Icon = "add"
Icon = "add",
OpensDialog = true
};
//we want to go to this route: /member/member/edit/-1?create=true
createMenuItem.NavigateToRoute("/member/member/edit/-1?create=true");
@@ -181,7 +180,7 @@ namespace Umbraco.Web.Trees
}
//add delete option for all members
menu.Items.Add<ActionDelete>(Services.TextService);
menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
if (Security.CurrentUser.HasAccessToSensitiveData())
{