lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-23 04:43:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Refactoring Model concepts into ContentItem based concepts.

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041350
This commit is contained in:
loudej
2009-11-19 05:17:02 +00:00
parent ca6566ef73
commit 3d867826c5
64 changed files with 406 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Orchard.Web/Packages/Orchard.Users/Controllers/AdminController.cs
View File

@@ -14,17 +14,17 @@ namespace Orchard.Users.Controllers {
public class AdminController : Controller, IModelUpdater {
private readonly IMembershipService _membershipService;
private readonly IModelManager _modelManager;
private readonly IContentManager _contentManager;
private readonly IRepository<UserRecord> _userRepository;
private readonly INotifier _notifier;
public AdminController(
IMembershipService membershipService,
IModelManager modelManager,
IContentManager contentManager,
IRepository<UserRecord> userRepository,
INotifier notifier) {
_membershipService = membershipService;
_modelManager = modelManager;
_contentManager = contentManager;
_userRepository = userRepository;
_notifier = notifier;
T = NullLocalizer.Instance;
@@ -38,7 +38,7 @@ namespace Orchard.Users.Controllers {
var model = new UsersIndexViewModel();
model.Rows = _userRepository.Fetch(x => x.UserName != null)
.Select(x => new UsersIndexViewModel.Row {
User = _modelManager.Get(x.Id).As<UserModel>()
User = _contentManager.Get(x.Id).As<UserModel>()
})
.ToList();
@@ -67,15 +67,15 @@ namespace Orchard.Users.Controllers {
}
public ActionResult Edit(int id) {
var model = new UserEditViewModel { User = _modelManager.Get(id) };
model.Editors = _modelManager.GetEditors(model.User);
var model = new UserEditViewModel { User = _contentManager.Get<UserModel>(id) };
model.Editors = _contentManager.GetEditors(model.User.ContentItem);
return View(model);
}
[HttpPost]
public ActionResult Edit(int id, FormCollection input) {
var model = new UserEditViewModel { User = _modelManager.Get(id) };
model.Editors = _modelManager.UpdateEditors(model.User, this);
var model = new UserEditViewModel { User = _contentManager.Get<UserModel>(id) };
model.Editors = _contentManager.UpdateEditors(model.User.ContentItem, this);
if (!TryUpdateModel(model, input.ToValueProvider())) {
return View(model);