Adding role selection to user screen. This also introduces the idea of displaying composite editors for composite objects.

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4039988

src/Orchard.Web/Orchard.Web.csproj

@@ -157,6 +157,7 @@
     <Content Include="Content\Site2.css" />
     <Content Include="Content\Site3.css" />
     <Content Include="Views\Admin\Messages.ascx" />
+    <Content Include="Views\Admin\UserRoles.ascx" />
     <Content Include="Views\Shared\ExtraUserControl.ascx" />
     <Content Include="Views\Shared\Footer.ascx" />
     <Content Include="Views\Shared\Header.ascx" />

src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesModel.cs

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using Orchard.Models;
+
+namespace Orchard.Roles.Models.NoRecord {
+    public interface IUserRoles {
+        IList<string> Roles { get; }
+    }
+
+    public class UserRolesModel : ModelPart, IUserRoles {
+        public UserRolesModel() {
+            Roles = new List<string>();
+        }
+
+        public IList<string> Roles { get; set; }
+    }
+}

src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesModelDriver.cs

@@ -0,0 +1,91 @@
+using System.Linq;
+using Orchard.Data;
+using Orchard.Logging;
+using Orchard.Models.Driver;
+using Orchard.Roles.Models.NoRecord;
+using Orchard.Roles.Services;
+using Orchard.Roles.ViewModels;
+using Orchard.Security;
+using Orchard.UI.Models;
+using Orchard.UI.Notify;
+
+namespace Orchard.Roles.Models {
+    public class UserRolesModelDriver : ModelDriver {
+        private readonly IRepository<UserRolesRecord> _userRolesRepository;
+        private readonly IRoleService _roleService;
+        private readonly INotifier _notifier;
+
+        public UserRolesModelDriver(IRepository<UserRolesRecord> userRolesRepository, IRoleService roleService, INotifier notifier) {
+            _userRolesRepository = userRolesRepository;
+            _roleService = roleService;
+            _notifier = notifier;
+        }
+
+        protected override void New(NewModelContext context) {
+            if (context.ModelType == "user") {
+                WeldModelPart<UserRolesModel>(context);
+            }
+        }
+
+        protected override void Create(CreateModelContext context) {
+            var userRoles = context.Instance.As<UserRolesModel>();
+            if (userRoles != null) {
+            }
+        }
+
+        protected override void Load(LoadModelContext context) {
+            var userRoles = context.Instance.As<UserRolesModel>();
+            if (userRoles != null) {
+                userRoles.Roles = _userRolesRepository.Fetch(x => x.UserId == userRoles.Id)
+                    .Select(x => x.Role.Name).ToList();
+            }
+        }
+
+        protected override void GetEditors(GetModelEditorsContext context) {
+            var userRoles = context.Instance.As<UserRolesModel>();
+            if (userRoles != null) {
+                var roles =
+                    _roleService.GetRoles().Select(
+                        x => new UserRoleEntry {
+                            RoleId = x.Id,
+                            Name = x.Name,
+                            Granted = userRoles.Roles.Contains(x.Name)
+                        });
+
+                var viewModel = new UserRolesViewModel {
+                    User = userRoles.As<IUser>(),
+                    UserRoles = userRoles,
+                    Roles = roles.ToList(),
+                };
+
+                context.Editors.Add(ModelEditor.For("UserRoles", viewModel));
+            }
+        }
+
+        protected override void UpdateEditors(UpdateModelContext context) {
+            var userRoles = context.Instance.As<UserRolesModel>();
+            if (userRoles != null) {
+                var viewModel = new UserRolesViewModel();
+                if (context.Updater.TryUpdateModel(viewModel, null, null, null)) {
+
+                    var currentUserRoleRecords = _userRolesRepository.Fetch(x => x.UserId == userRoles.Id);
+                    var currentRoleRecords = currentUserRoleRecords.Select(x => x.Role);
+                    var targetRoleRecords = viewModel.Roles.Where(x => x.Granted).Select(x => _roleService.GetRole(x.RoleId));
+
+                    foreach (var addingRole in targetRoleRecords.Where(x => !currentRoleRecords.Contains(x))) {
+                        _notifier.Warning(string.Format("Adding role {0} to user {1}", addingRole.Name, userRoles.As<IUser>().UserName));
+                        _userRolesRepository.Create(new UserRolesRecord { UserId = userRoles.Id, Role = addingRole });
+                    }
+
+                    foreach (var removingRole in currentUserRoleRecords.Where(x => !targetRoleRecords.Contains(x.Role))) {
+                        _notifier.Warning(string.Format("Removing role {0} from user {1}", removingRole.Role.Name, userRoles.As<IUser>().UserName));
+                        _userRolesRepository.Delete(removingRole);
+                    }
+
+                }
+                context.Editors.Add(ModelEditor.For("UserRoles", viewModel));
+            }
+        }
+    }
+}
+

src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesRecord.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Orchard.Roles.Models {
+    public class UserRolesRecord {
+        public virtual int Id { get; set; }
+        public virtual int UserId { get; set; }
+        public virtual RoleRecord Role { get; set; }
+    }
+}

src/Orchard.Web/Packages/Orchard.Roles/Orchard.Roles.csproj

@@ -65,13 +65,17 @@
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Models\PermissionRecord.cs" />
     <Compile Include="Models\RoleRecord.cs" />
+    <Compile Include="Models\UserRolesModel.cs" />
+    <Compile Include="Models\UserRolesModelDriver.cs" />
     <Compile Include="Models\RolesPermissions.cs" />
+    <Compile Include="Models\UserRolesRecord.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\RolesBasedAuthorizationService.cs" />
     <Compile Include="Services\RoleService.cs" />
     <Compile Include="ViewModels\RoleCreateViewModel.cs" />
     <Compile Include="ViewModels\RoleEditViewModel.cs" />
     <Compile Include="ViewModels\RolesIndexViewModel.cs" />
+    <Compile Include="ViewModels\UserRolesViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Package.txt" />

src/Orchard.Web/Packages/Orchard.Roles/ViewModels/UserRolesViewModel.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using Orchard.Roles.Models.NoRecord;
+using Orchard.Security;
+
+namespace Orchard.Roles.ViewModels {
+    public class UserRolesViewModel {
+        public IUser User { get; set; }
+        public IUserRoles UserRoles { get; set; }
+        public IList<UserRoleEntry> Roles { get; set; }
+    }
+
+    public class UserRoleEntry {
+        public int RoleId { get; set; }
+        public string Name { get; set; }
+        public bool Granted { get; set; }
+    }
+}

src/Orchard.Web/Packages/Orchard.Users/Controllers/AdminController.cs

@@ -3,13 +3,14 @@ using System.Linq;
 using System.Web.Mvc;
 using Orchard.Data;
 using Orchard.Models;
+using Orchard.Models.Driver;
 using Orchard.Security;
 using Orchard.UI.Notify;
 using Orchard.Users.Models;
 using Orchard.Users.ViewModels;
 
 namespace Orchard.Users.Controllers {
-    public class AdminController : Controller {
+    public class AdminController : Controller, IModelUpdater {
         private readonly IModelManager _modelManager;
         private readonly IRepository<UserRecord> _userRepository;
         private readonly INotifier _notifier;
@@ -54,12 +55,15 @@ namespace Orchard.Users.Controllers {
 
         public ActionResult Edit(int id) {
             var model = new UserEditViewModel { User = _modelManager.Get(id) };
+            model.Editors = _modelManager.GetEditors(model.User);
             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);
+
             if (!TryUpdateModel(model, input.ToValueProvider())) {
                 return View(model);
             }
@@ -67,6 +71,10 @@ namespace Orchard.Users.Controllers {
             return RedirectToAction("Edit", new { id });
         }
 
+
+        bool IModelUpdater.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {
+            return TryUpdateModel(model, prefix, includeProperties, excludeProperties);
+        }
     }
 
 }

src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserEditViewModel.cs

@@ -1,12 +1,15 @@
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Web.Mvc;
 using Orchard.Models;
 using Orchard.Mvc.ViewModels;
+using Orchard.UI.Models;
 using Orchard.Users.Models;
 
 namespace Orchard.Users.ViewModels {
     public class UserEditViewModel : AdminViewModel {
         public IModel User { get; set; }
+        public IEnumerable<ModelEditor> Editors { get; set; }
 
         [HiddenInput(DisplayValue = false)]
         public int Id {

src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserEditViewModel.ascx

@@ -6,3 +6,7 @@
     <%=Html.EditorFor(m=>m.UserName, "inputTextLarge") %>
     <%=Html.EditorFor(m=>m.Email, "inputTextLarge") %>
 </ol>
+
+<% foreach(var editor in Model.Editors) {
+     Html.RenderPartial(editor.PartialName, editor.ViewData);
+} %>

src/Orchard.Web/Views/Admin/UserRoles.ascx

@@ -0,0 +1,16 @@
+<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.Roles.ViewModels.UserRolesViewModel>" %>
+<h3>
+    Roles</h3>
+<ol>
+<%
+    var index = 0; foreach (var entry in Model.Roles) {%>
+<li>
+    
+    <%= Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId)%>
+    
+    <label for="<%="Roles[" + index + "]_Granted"%>"><%= Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%> <%=Html.Encode(entry.Name)%></label>
+</li>
+<%++index;
+    } %>
+    </ol>
+    

src/Orchard/Models/DefaultModelManager.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Web.Mvc;
 using Orchard.Data;
 using Orchard.Models.Driver;
 using Orchard.Models.Records;
+using Orchard.UI.Models;
 
 namespace Orchard.Models {
     public class DefaultModelManager : IModelManager {
@@ -82,6 +84,22 @@ namespace Orchard.Models {
             }
         }
 
+        public IEnumerable<ModelEditor> GetEditors(IModel model) {
+            var context = new GetModelEditorsContext(model);
+            foreach (var driver in _drivers) {
+                driver.GetEditors(context);
+            }
+            return context.Editors;
+        }
+
+        public IEnumerable<ModelEditor> UpdateEditors(IModel model, IModelUpdater updater) {
+            var context = new UpdateModelContext(model, updater);
+            foreach (var driver in _drivers) {
+                driver.UpdateEditors(context);
+            }
+            return context.Editors;
+        }
+
         private ModelTypeRecord AcquireModelTypeRecord(string modelType) {
             var modelTypeRecord = _modelTypeRepository.Get(x => x.Name == modelType);
             if (modelTypeRecord == null) {

src/Orchard/Models/Driver/GetModelEditorsContext.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Orchard.UI.Models;
+
+namespace Orchard.Models.Driver {
+    public class GetModelEditorsContext {
+        public GetModelEditorsContext(IModel model) {
+            Instance = model;
+            Editors= new List<ModelEditor>();
+        }
+        public IModel Instance { get; set; }
+        public IList<ModelEditor> Editors { get; set; }
+    }
+}

src/Orchard/Models/Driver/IModelDriver.cs

@@ -3,5 +3,8 @@
         void New(NewModelContext context);
         void Create(CreateModelContext context);
         void Load(LoadModelContext context);
+
+        void GetEditors(GetModelEditorsContext context);
+        void UpdateEditors(UpdateModelContext context);
     }
 }

src/Orchard/Models/Driver/IModelUpdater.cs

@@ -0,0 +1,5 @@
+namespace Orchard.Models.Driver {
+    public interface IModelUpdater {
+        bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) where TModel : class;
+    }
+}

src/Orchard/Models/Driver/ModelDriver.cs

@@ -12,6 +12,8 @@ namespace Orchard.Models.Driver {
         void IModelDriver.New(NewModelContext context) {New(context);}
         void IModelDriver.Create(CreateModelContext context) { Create(context); }
         void IModelDriver.Load(LoadModelContext context) { Load(context); }
+        void IModelDriver.GetEditors(GetModelEditorsContext context) { GetEditors(context); }
+        void IModelDriver.UpdateEditors(UpdateModelContext context) { UpdateEditors(context); }
 
         protected virtual void New(NewModelContext context) {
         }
@@ -22,10 +24,22 @@ namespace Orchard.Models.Driver {
         protected virtual void Create(CreateModelContext context) {
         }
 
+        protected virtual void GetEditors(GetModelEditorsContext context) {
+        }
+
+        protected virtual void UpdateEditors(UpdateModelContext context) {
+        }
+
+        /// <summary>
+        /// TODO: move this - make a modelbuilder class or something
+        /// </summary>
+        /// <typeparam name="TPart"></typeparam>
+        /// <param name="context"></param>
         protected void WeldModelPart<TPart>(NewModelContext context) where TPart : class,IModel,new() {
             var newPart = new TPart();
             newPart.Weld(context.Instance);
             context.Instance = newPart;
         }
+
     }
 }

src/Orchard/Models/Driver/UpdateModelContext.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Web.Mvc;
+using Orchard.UI.Models;
+
+namespace Orchard.Models.Driver {
+    public class UpdateModelContext : GetModelEditorsContext {
+        public UpdateModelContext(IModel model, IModelUpdater updater) : base(model) {
+            Updater = updater;
+        }
+
+        public IModelUpdater Updater { get; set; }
+    }
+}

src/Orchard/Models/IModelManager.cs

@@ -1,7 +1,14 @@
+using System.Collections.Generic;
+using System.Web.Mvc;
+using Orchard.Models.Driver;
+using Orchard.UI.Models;
+
 namespace Orchard.Models {
     public interface IModelManager : IDependency {
         IModel New(string modelType);
         IModel Get(int id);
         void Create(IModel model);
+        IEnumerable<ModelEditor> GetEditors(IModel model);
+        IEnumerable<ModelEditor> UpdateEditors(IModel model, IModelUpdater updater);
     }
 }

src/Orchard/Orchard.csproj

@@ -90,9 +90,9 @@
     <Compile Include="Data\ISessionLocator.cs" />
     <Compile Include="Data\DataModule.cs" />
     <Compile Include="Data\Orderable.cs" />
-    <Compile Include="Environment\DefaultOrchardShell.cs" />
+    <Compile Include="Models\Environment\DefaultOrchardShell.cs" />
-    <Compile Include="Environment\IOrchardShell.cs" />
+    <Compile Include="Models\Environment\IOrchardShell.cs" />
-    <Compile Include="Environment\OrchardStarter.cs" />
+    <Compile Include="Models\Environment\OrchardStarter.cs" />
     <Compile Include="IDependency.cs" />
     <Compile Include="Mvc\Html\ThemeExtensions.cs" />
     <Compile Include="Mvc\Routes\IRoutePublisher.cs" />
@@ -103,12 +103,12 @@
     <Compile Include="Mvc\Routes\RouteDescriptor.cs" />
     <Compile Include="Utility\ReadOnlyCollectionExtensions.cs" />
     <Compile Include="Data\Repository.cs" />
-    <Compile Include="Environment\DefaultCompositionStrategy.cs" />
+    <Compile Include="Models\Environment\DefaultCompositionStrategy.cs" />
-    <Compile Include="Environment\DefaultOrchardHost.cs" />
+    <Compile Include="Models\Environment\DefaultOrchardHost.cs" />
     <Compile Include="Mvc\MvcModule.cs" />
     <Compile Include="Mvc\OrchardControllerFactory.cs" />
-    <Compile Include="Environment\HostContext.cs" />
+    <Compile Include="Models\Environment\HostContext.cs" />
-    <Compile Include="Environment\IOrchardHost.cs" />
+    <Compile Include="Models\Environment\IOrchardHost.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Validation\Argument.cs" />
   </ItemGroup>
@@ -117,7 +117,8 @@
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Data\Conventions\AttributeCollectionConvention.cs" />
     <Compile Include="Data\Conventions\CascadeAllDeleteOrphanAttribute.cs" />
-    <Compile Include="Environment\ServiceLocator.cs" />
+    <Compile Include="Models\Driver\IModelUpdater.cs" />
+    <Compile Include="Models\Environment\ServiceLocator.cs" />
     <Compile Include="Logging\CastleLogger.cs" />
     <Compile Include="Logging\CastleLoggerFactory.cs" />
     <Compile Include="Logging\ILogger.cs" />
@@ -132,6 +133,7 @@
     <Compile Include="Models\Driver\ModelDriver.cs" />
     <Compile Include="Models\Driver\ModelDriverWithRecord.cs" />
     <Compile Include="Models\Driver\NewModelContext.cs" />
+    <Compile Include="Models\Driver\GetModelEditorsContext.cs" />
     <Compile Include="Models\IModelManager.cs" />
     <Compile Include="Models\Driver\IModelDriver.cs" />
     <Compile Include="Models\IModel.cs" />
@@ -142,6 +144,7 @@
     <Compile Include="Models\Records\ModelPartRecord.cs" />
     <Compile Include="Models\Records\ModelTypeRecord.cs" />
     <Compile Include="Models\Records\ModelRecord.cs" />
+    <Compile Include="Models\Driver\UpdateModelContext.cs" />
     <Compile Include="Mvc\Html\HtmlHelperExtensions.cs" />
     <Compile Include="Mvc\Filters\FilterProvider.cs" />
     <Compile Include="Mvc\Filters\FilterResolvingActionInvoker.cs" />
@@ -159,6 +162,7 @@
     <Compile Include="Security\SecurityFilter.cs" />
     <Compile Include="Security\SecurityModule.cs" />
     <Compile Include="UI\Menus\AdminMenuFilter.cs" />
+    <Compile Include="UI\Models\ModelEditor.cs" />
     <Compile Include="UI\Navigation\INavigationBuilder.cs" />
     <Compile Include="UI\Navigation\INavigationProvider.cs" />
     <Compile Include="UI\Navigation\MenuItem.cs" />

src/Orchard/UI/Models/ModelEditor.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.Mvc;
+
+namespace Orchard.UI.Models {
+    public class ModelEditor {
+        public string PartialName { get; set; }
+        public ViewDataDictionary ViewData { get; set; }
+
+        public static ModelEditor For<TModel>(string partialName, TModel model) {
+            return new ModelEditor {
+                PartialName = partialName,
+                ViewData = new ViewDataDictionary<TModel>(model)
+            };
+        }
+    }
+}