From ca56539c65428f145a86328fee08a51773f01e1f Mon Sep 17 00:00:00 2001 From: perploug Date: Mon, 30 Sep 2013 13:18:34 +0200 Subject: [PATCH] Fixes U4-2980 - tabs not in the right order --- src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs index 3fa84932ae..011f5ba499 100644 --- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs @@ -111,7 +111,7 @@ namespace Umbraco.Web.Models.Mapping //now we need to aggregate the tabs and properties since we might have duplicate tabs (based on aliases) because // of how content composition works. - foreach (var propertyGroups in content.PropertyGroups.GroupBy(x => x.Name)) + foreach (var propertyGroups in content.PropertyGroups.OrderBy(x => x.SortOrder).GroupBy(x => x.Name)) { var aggregateProperties = new List(); @@ -158,6 +158,7 @@ namespace Umbraco.Web.Models.Mapping Properties = Mapper.Map, IEnumerable>(orphanProperties) }); + //set the first tab to active aggregateTabs.First().IsActive = true;