Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7

2017-07-17 17:51:39 +02:00
parent 3a5584a1c1 4d0a2c85b7
commit 95b0c342bb
46 changed files with 808 additions and 163 deletions
--- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
@@ -165,7 +165,7 @@ namespace Umbraco.Web.Models.Mapping
            var listViewTab = new Tab<ContentPropertyDisplay>();
            listViewTab.Alias = Constants.Conventions.PropertyGroups.ListViewGroupName;
            listViewTab.Label = localizedTextService.Localize("content/childItems");
-            listViewTab.Id = 25;
+            listViewTab.Id = display.Tabs.Count() + 1;
            listViewTab.IsActive = true;

            var listViewConfig = editor.PreValueEditor.ConvertDbToEditor(editor.DefaultPreValues, preVals);