From bad4d0c6e6dceff3774b305e7aef6b63c6e0132c Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 2 Oct 2013 09:30:53 +1000 Subject: [PATCH] fixes merge issues --- src/Umbraco.Web/Models/ContentEditing/MemberSave.cs | 3 +++ src/Umbraco.Web/WebApi/Binders/MemberBinder.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs b/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs index 198d489d83..fced242708 100644 --- a/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs +++ b/src/Umbraco.Web/Models/ContentEditing/MemberSave.cs @@ -16,5 +16,8 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "email", IsRequired = true)] [RequiredForPersistence(AllowEmptyStrings = false, ErrorMessage = "Required")] public string Email { get; set; } + + [DataMember(Name = "password", IsRequired = true)] + public string Password { get; set; } } } \ No newline at end of file diff --git a/src/Umbraco.Web/WebApi/Binders/MemberBinder.cs b/src/Umbraco.Web/WebApi/Binders/MemberBinder.cs index be399b88a6..0051bf94d8 100644 --- a/src/Umbraco.Web/WebApi/Binders/MemberBinder.cs +++ b/src/Umbraco.Web/WebApi/Binders/MemberBinder.cs @@ -43,7 +43,7 @@ namespace Umbraco.Web.WebApi.Binders { throw new InvalidOperationException("No member type found wth alias " + model.ContentTypeAlias); } - return new Member(model.Name, model.ParentId, contentType, new PropertyCollection()); + return new Member(model.Name, model.Email, model.Username, model.Password, -1, contentType); } protected override ContentItemDto MapFromPersisted(MemberSave model)