From b13b4953c3f81616ac7db9e2b768b19aed007643 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 21 Dec 2015 10:37:54 +0100 Subject: [PATCH 1/2] U4-6890 New content type editor: Missing sorting of properties from server --- src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs index f9ae01e9cd..d548a9722f 100644 --- a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs @@ -155,7 +155,7 @@ namespace Umbraco.Web.Models.Mapping { var mappedProperties = new List(); - foreach (var p in properties.Where(x => x.DataTypeDefinitionId != 0) ) + foreach (var p in properties.Where(x => x.DataTypeDefinitionId != 0).OrderBy(x => x.SortOrder)) { var propertyEditor = _propertyEditorResolver.Value.GetByAlias(p.PropertyEditorAlias); var preValues = _applicationContext.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(p.DataTypeDefinitionId); From bb5812ba5482a449bc0730c5d68ed67227ca7a58 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 22 Dec 2015 14:46:57 +0100 Subject: [PATCH 2/2] remove front-end sorting of properties in content types --- .../src/views/documenttypes/edit.controller.js | 5 ----- .../src/views/mediatypes/edit.controller.js | 5 ----- .../src/views/membertypes/edit.controller.js | 5 ----- 3 files changed, 15 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js index 621e1aac9e..0700e08c2e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js @@ -231,11 +231,6 @@ }); } - // sort properties after sort order - angular.forEach(contentType.groups, function (group) { - group.properties = $filter('orderBy')(group.properties, 'sortOrder'); - }); - // insert template on new doc types if (!$routeParams.notemplate && contentType.id === 0) { contentType.defaultTemplate = contentTypeHelper.insertDefaultTemplatePlaceholder(contentType.defaultTemplate); diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js index 28f7cf59f5..9bffc10fcb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js @@ -181,11 +181,6 @@ }); } - - // sort properties after sort order - angular.forEach(contentType.groups, function (group) { - group.properties = $filter('orderBy')(group.properties, 'sortOrder'); - }); // convert icons for content type convertLegacyIcons(contentType); diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js index bf830c8915..728c311e11 100644 --- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js @@ -136,11 +136,6 @@ // convert legacy icons convertLegacyIcons(contentType); - // sort properties after sort order - angular.forEach(contentType.groups, function (group) { - group.properties = $filter('orderBy')(group.properties, 'sortOrder'); - }); - //set a shared state editorState.set(contentType);