lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Build*Model -> Build*Shape (in process of changing to work with (Clay) shapes instead of ContentItemViewModel)

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-09-02 15:11:33 -07:00
parent 203b3e09c6
commit 33d47b3c39
36 changed files with 199 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@ using Orchard.ContentManagement;
using Orchard.Localization;
using Orchard.Security;
using Orchard.UI.Notify;
using Orchard.Users.Drivers;
using Orchard.Users.Models;
using Orchard.Users.Services;
using Orchard.Users.ViewModels;
@@ -50,9 +49,9 @@ namespace Orchard.Users.Controllers {
if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")))
return new HttpUnauthorizedResult();
var user = Services.ContentManager.New<IUser>(UserPartDriver.ContentType.Name);
var user = Services.ContentManager.New<IUser>("User");
var model = new UserCreateViewModel {
User = Services.ContentManager.BuildEditorModel(user)
User = Services.ContentManager.BuildEditorShape(user)
};
return View(model);
}
@@ -62,8 +61,8 @@ namespace Orchard.Users.Controllers {
if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")))
return new HttpUnauthorizedResult();
var user = Services.ContentManager.New<IUser>(UserPartDriver.ContentType.Name);
model.User = Services.ContentManager.UpdateEditorModel(user, this);
var user = Services.ContentManager.New<IUser>("User");
model.User = Services.ContentManager.UpdateEditorShape(user, this);
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
return View(model);
@@ -84,7 +83,7 @@ namespace Orchard.Users.Controllers {
model.Email,
null, null, true));
model.User = Services.ContentManager.UpdateEditorModel(user, this);
model.User = Services.ContentManager.UpdateEditorShape(user, this);
if (ModelState.IsValid == false) {
Services.TransactionManager.Cancel();
@@ -99,7 +98,7 @@ namespace Orchard.Users.Controllers {
return new HttpUnauthorizedResult();
return View(new UserEditViewModel {
User = Services.ContentManager.BuildEditorModel<UserPart>(id)
User = Services.ContentManager.BuildEditorShape<UserPart>(id)
});
}
@@ -109,7 +108,7 @@ namespace Orchard.Users.Controllers {
return new HttpUnauthorizedResult();
var model = new UserEditViewModel {
User = Services.ContentManager.UpdateEditorModel<UserPart>(id, this)
User = Services.ContentManager.UpdateEditorShape<UserPart>(id, this)
};
TryUpdateModel(model);