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

Merge branch 'dev-v7' into temp8

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web/PropertyEditors/MemberGroupPickerPropertyEditor.cs
#	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
#	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
This commit is contained in:
Sebastiaan Janssen
2019-01-17 12:05:56 +01:00
parent 93ba694106 f7671ec9a7
commit e6a99c5097
6 changed files with 98 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web/Trees/ContentTreeController.cs
View File

@@ -237,14 +237,16 @@ namespace Umbraco.Web.Trees
AddActionNode<ActionRights>(item, menu, opensDialog: true);
//fixme - conver this editor to angular
AddActionNode<ActionProtect>(item, menu, true, convert: true, opensDialog: true);
menu.Items.Add(new MenuItem("notify", Services.TextService)
if (EmailSender.CanSendRequiredEmail)
{
Icon = "megaphone",
SeperatorBefore = true,
OpensDialog = true
});
menu.Items.Add(new MenuItem("notify", Services.TextService)
{
Icon = "megaphone",
SeperatorBefore = true,
OpensDialog = true
});
}
menu.Items.Add(new RefreshNode(Services.TextService, true));
return menu;