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 build.

Browse Source
This commit is contained in:
Suha Can
2010-04-16 12:47:06 -07:00
parent 0fa617e7f0
commit 31c154ebc4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
View File

@@ -1,6 +1,5 @@
using System; using System;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Security.Principal; using System.Security.Principal;
using System.Web.Mvc; using System.Web.Mvc;
using System.Web.Security; using System.Web.Security;

11
src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
View File

@@ -2,7 +2,6 @@ using System.Linq;
using System.Web.Mvc; using System.Web.Mvc;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Mvc.Extensions;
using Orchard.Security; using Orchard.Security;
using Orchard.UI.Notify; using Orchard.UI.Notify;
using Orchard.Users.Drivers; using Orchard.Users.Drivers;
@@ -71,11 +70,11 @@ namespace Orchard.Users.Controllers {
string userExistsMessage = _userService.VerifyUserUnicity(model.UserName, model.Email); string userExistsMessage = _userService.VerifyUserUnicity(model.UserName, model.Email);
if (userExistsMessage != null) { if (userExistsMessage != null) {
ModelState.AddModelError("NotUniqueUserName", T(userExistsMessage)); AddModelError("NotUniqueUserName", T(userExistsMessage));
} }
if (model.Password != model.ConfirmPassword) { if (model.Password != model.ConfirmPassword) {
ModelState.AddModelError("ConfirmPassword", T("Password confirmation must match")); AddModelError("ConfirmPassword", T("Password confirmation must match"));
} }
user = _membershipService.CreateUser(new CreateUserParams( user = _membershipService.CreateUser(new CreateUserParams(
@@ -123,7 +122,7 @@ namespace Orchard.Users.Controllers {
string userExistsMessage = _userService.VerifyUserUnicity(id, model.UserName, model.Email); string userExistsMessage = _userService.VerifyUserUnicity(id, model.UserName, model.Email);
if (userExistsMessage != null) { if (userExistsMessage != null) {
ModelState.AddModelError("NotUniqueUserName", T(userExistsMessage)); AddModelError("NotUniqueUserName", T(userExistsMessage));
} }
if (!ModelState.IsValid) { if (!ModelState.IsValid) {
@@ -148,6 +147,10 @@ namespace Orchard.Users.Controllers {
bool IUpdateModel.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) { bool IUpdateModel.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {
return TryUpdateModel(model, prefix, includeProperties, excludeProperties); return TryUpdateModel(model, prefix, includeProperties, excludeProperties);
} }
public void AddModelError(string key, LocalizedString errorMessage) {
ModelState.AddModelError(key, errorMessage.ToString());
}
} }
} }