From 10617d1bd52bdac57534a7d7b868954f1185f9cf Mon Sep 17 00:00:00 2001
From: Claus <claus@claus.nu>
Date: Sun, 24 Jan 2016 22:18:18 +0100
Subject: [PATCH] Agree, these should not be needed - removing.

---
 .../Models/ContentEditing/PropertyTypeDisplay.cs     | 10 ----------
 .../Models/Mapping/PropertyTypeGroupResolver.cs      | 12 +++++-------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web/Models/ContentEditing/PropertyTypeDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/PropertyTypeDisplay.cs
index f0e725ed59..ce9e2b7586 100644
--- a/src/Umbraco.Web/Models/ContentEditing/PropertyTypeDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/PropertyTypeDisplay.cs
@@ -27,15 +27,5 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "locked")]
         [ReadOnly(true)]
         public bool Locked { get; set; }
-
-        ////SD: Seems strange that this is needed
-        //[DataMember(Name = "contentTypeId")]
-        //[ReadOnly(true)]
-        //public int ContentTypeId { get; set; }
-
-        ////SD: Seems strange that this is needed
-        //[DataMember(Name = "contentTypeName")]
-        //[ReadOnly(true)]
-        //public string ContentTypeName { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs
index 61a8a56c3b..b904bb4f9f 100644
--- a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Web.Models.Mapping
                     ContentTypeId = source.Id
                 };
 
-                group.Properties = MapProperties(tab.PropertyTypes, source, tab.Id, false);
+                group.Properties = MapProperties(tab.PropertyTypes, tab.Id, false);
                 groups.Add(group);
             }         
 
@@ -85,7 +85,7 @@ namespace Umbraco.Web.Models.Mapping
                     ParentTabContentTypeNames = new[] { definingContentType.Name }
                 };
 
-                group.Properties = MapProperties(tab.PropertyTypes, definingContentType, tab.Id, true);
+                group.Properties = MapProperties(tab.PropertyTypes, tab.Id, true);
                 groups.Add(group);
             }
 
@@ -94,14 +94,14 @@ namespace Umbraco.Web.Models.Mapping
 
             // add generic properties local to this content type
             var entityGenericProperties = source.PropertyTypes.Where(x => x.PropertyGroupId == null);
-            genericProperties.AddRange(MapProperties(entityGenericProperties, source, PropertyGroupBasic.GenericPropertiesGroupId, false));
+            genericProperties.AddRange(MapProperties(entityGenericProperties, PropertyGroupBasic.GenericPropertiesGroupId, false));
 
             // add generic properties inherited through compositions
             var localGenericPropertyIds = genericProperties.Select(x => x.Id).ToArray();
             var compositionGenericProperties = source.CompositionPropertyTypes
                 .Where(x => x.PropertyGroupId == null // generic
                     && localGenericPropertyIds.Contains(x.Id) == false); // skip those that are local
-            genericProperties.AddRange(MapProperties(compositionGenericProperties, source, PropertyGroupBasic.GenericPropertiesGroupId, true));
+            genericProperties.AddRange(MapProperties(compositionGenericProperties, PropertyGroupBasic.GenericPropertiesGroupId, true));
 
             // if there are any generic properties, add the corresponding tab
             if (genericProperties.Any())
@@ -165,7 +165,7 @@ namespace Umbraco.Web.Models.Mapping
             return groups.OrderBy(x => x.SortOrder);
         }
 
-        private IEnumerable<TPropertyType> MapProperties(IEnumerable<PropertyType> properties, IContentTypeBase contentType, int groupId, bool inherited)
+        private IEnumerable<TPropertyType> MapProperties(IEnumerable<PropertyType> properties, int groupId, bool inherited)
         {
             var mappedProperties = new List<TPropertyType>();
 
@@ -185,8 +185,6 @@ namespace Umbraco.Web.Models.Mapping
                         View = propertyEditor.ValueEditor.View,
                         Config = propertyEditor.PreValueEditor.ConvertDbToEditor(propertyEditor.DefaultPreValues, preValues) ,
                         //Value = "",
-                        //ContentTypeId = contentType.Id,
-                        //ContentTypeName = contentType.Name,
                         GroupId = groupId,
                         Inherited = inherited,
                         DataTypeId = p.DataTypeDefinitionId,