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

Corrected merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2010-10-11 13:53:07 -07:00
parent 8154bf7496
commit 6f72d040b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,7 @@ namespace Orchard.Users.Controllers {
var user = Services.ContentManager.Get<UserPart>(id); var user = Services.ContentManager.Get<UserPart>(id);
return View(new UserEditViewModel { return View(new UserEditViewModel {
User = Services.ContentManager.BuildEditorModel(user) User = Services.ContentManager.BuildEditor(user)
}); });
} }
@@ -119,7 +119,7 @@ namespace Orchard.Users.Controllers {
var user = Services.ContentManager.Get(id); var user = Services.ContentManager.Get(id);
var model = new UserEditViewModel { var model = new UserEditViewModel {
User = Services.ContentManager.UpdateEditorModel(user, this) User = Services.ContentManager.UpdateEditor(user, this)
}; };
TryUpdateModel(model); TryUpdateModel(model);