lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixing User unit tests

Browse Source
This commit is contained in:
Sebastien Ros
2014-03-28 10:03:54 -07:00
parent 373421c310
commit 5da0177c68
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Users/Models/UserPart.cs
View File

@@ -49,12 +49,12 @@ namespace Orchard.Users.Models {
}
public UserStatus RegistrationStatus {
get { return Retrieve(x => x.RegistrationStatus, UserStatus.Approved); }
get { return Retrieve(x => x.RegistrationStatus, UserStatus.Pending); }
set { Store(x => x.RegistrationStatus, value); }
}
public UserStatus EmailStatus {
get { return Retrieve(x => x.EmailStatus, UserStatus.Approved); }
get { return Retrieve(x => x.EmailStatus, UserStatus.Pending); }
set { Store(x => x.EmailStatus, value); }
}
}

16
src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
View File

@@ -59,20 +59,20 @@ namespace Orchard.Users.Services {
var user = _orchardServices.ContentManager.New<UserPart>("User");
user.Record.UserName = createUserParams.Username;
user.Record.Email = createUserParams.Email;
user.Record.NormalizedUserName = createUserParams.Username.ToLowerInvariant();
user.Record.HashAlgorithm = "SHA1";
user.UserName = createUserParams.Username;
user.Email = createUserParams.Email;
user.NormalizedUserName = createUserParams.Username.ToLowerInvariant();
user.HashAlgorithm = "SHA1";
SetPassword(user, createUserParams.Password);
if ( registrationSettings != null ) {
user.Record.RegistrationStatus = registrationSettings.UsersAreModerated ? UserStatus.Pending : UserStatus.Approved;
user.Record.EmailStatus = registrationSettings.UsersMustValidateEmail ? UserStatus.Pending : UserStatus.Approved;
user.RegistrationStatus = registrationSettings.UsersAreModerated ? UserStatus.Pending : UserStatus.Approved;
user.EmailStatus = registrationSettings.UsersMustValidateEmail ? UserStatus.Pending : UserStatus.Approved;
}
if(createUserParams.IsApproved) {
user.Record.RegistrationStatus = UserStatus.Approved;
user.Record.EmailStatus = UserStatus.Approved;
user.RegistrationStatus = UserStatus.Approved;
user.EmailStatus = UserStatus.Approved;
}
var userContext = new UserContext {User = user, Cancel = false, UserParameters = createUserParams};