Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent

src/Umbraco.Core/Models/Member.cs

@@ -20,19 +20,26 @@ namespace Umbraco.Core.Models
         private object _providerUserKey;
         private Type _userTypeKey;
 
-        public Member(string name, int parentId, IMemberType contentType, PropertyCollection properties) : base(name, parentId, contentType, properties)
+        public Member(string name, string email, string username, string password, int parentId, IMemberType contentType)
+            : base(name, parentId, contentType, new PropertyCollection())
         {
             Mandate.ParameterNotNull(contentType, "contentType");
 
             _contentType = contentType;
+            _email = email;
+            _username = username;
+            _password = password;
         }
 
-        public Member(string name, IContentBase parent, IMemberType contentType, PropertyCollection properties)
-            : base(name, parent, contentType, properties)
+        public Member(string name, string email, string username, string password, IContentBase parent, IMemberType contentType)
+            : base(name, parent, contentType, new PropertyCollection())
         {
             Mandate.ParameterNotNull(contentType, "contentType");
 
             _contentType = contentType;
+            _email = email;
+            _username = username;
+            _password = password;
         }
 
         private static readonly PropertyInfo DefaultContentTypeAliasSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.ContentTypeAlias);

src/Umbraco.Core/Models/MemberType.cs

@@ -114,5 +114,26 @@ namespace Umbraco.Core.Models
                 MemberTypePropertyTypes.Add(propertyTypeAlias, tuple);
             }
         }
+
+        /// <summary>
+        /// Method to call when Entity is being saved
+        /// </summary>
+        /// <remarks>Created date is set and a Unique key is assigned</remarks>
+        internal override void AddingEntity()
+        {
+            base.AddingEntity();
+
+            if (Key == Guid.Empty)
+                Key = Guid.NewGuid();
+        }
+
+        /// <summary>
+        /// Method to call when Entity is being updated
+        /// </summary>
+        /// <remarks>Modified Date is set and a new Version guid is set</remarks>
+        internal override void UpdatingEntity()
+        {
+            base.UpdatingEntity();
+        }
     }
 }

src/Umbraco.Core/Models/Rdbms/PropertyTypeGroupReadOnlyDto.cs

@@ -18,5 +18,8 @@ namespace Umbraco.Core.Models.Rdbms
 
         [Column("PropertyGroupSortOrder")]
         public int SortOrder { get; set; }
+
+        [Column("contenttypeNodeId")]
+        public int ContentTypeNodeId { get; set; }
     }
 }

src/Umbraco.Core/Models/Rdbms/PropertyTypeReadOnlyDto.cs

@@ -17,7 +17,7 @@ namespace Umbraco.Core.Models.Rdbms
         [Column("contentTypeId")]
         public int ContentTypeId { get; set; }
 
-        [Column("propertyTypeGroupId")]
+        [Column("PropertyTypesGroupId")]
         public int? PropertyTypeGroupId { get; set; }
 
         [Column("Alias")]