Merge branch 'v8-feature-action-ellipsis' of git://github.com/kjac/Umbraco-CMS into kjac-v8-feature-action-ellipsis

# Conflicts: # src/Umbraco.Web/_Legacy/Actions/ActionUnPublish.cs
2018-10-26 09:59:57 +02:00
parent 83f73c085f 4cfac8da16
commit 78d4b452f5
36 changed files with 100 additions and 2 deletions
--- a/src/Umbraco.Web/Models/Trees/MenuItem.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItem.cs
@@ -38,6 +38,7 @@ namespace Umbraco.Web.Models.Trees
            SeperatorBefore = false;
            Icon = legacyMenu.Icon;
            Action = legacyMenu;
+            OpensDialog = legacyMenu.OpensDialog;
        }
        #endregion

@@ -71,6 +72,10 @@ namespace Umbraco.Web.Models.Trees

        [DataMember(Name = "cssclass")]
        public string Icon { get; set; }
+
+        [DataMember(Name = "opensDialog")]
+        public bool OpensDialog { get; set; }
+
        #endregion

        #region Constants