More manual merging

2019-06-28 15:03:52 +10:00
parent 568835f7e2
commit 4a33ca99ba
13 changed files with 153 additions and 38 deletions
--- a/src/Umbraco.Core/Models/DataTypeExtensions.cs
+++ b/src/Umbraco.Core/Models/DataTypeExtensions.cs
@@ -62,7 +62,12 @@ namespace Umbraco.Core.Models
            Constants.DataTypes.Guids.TextstringGuid,
            Constants.DataTypes.Guids.TextareaGuid,
            Constants.DataTypes.Guids.UploadGuid,
-            Constants.DataTypes.Guids.LabelGuid,
+            Constants.DataTypes.Guids.LabelStringGuid,
+            Constants.DataTypes.Guids.LabelDecimalGuid,
+            Constants.DataTypes.Guids.LabelDateTimeGuid,
+            Constants.DataTypes.Guids.LabelBigIntGuid,
+            Constants.DataTypes.Guids.LabelTimeGuid,
+            Constants.DataTypes.Guids.LabelDateTimeGuid,
        };

        /// <summary>