From 77e73c70e10c3e7a09f00c375784f6cb073ebe5b Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Thu, 22 Jul 2010 14:33:25 -0700 Subject: [PATCH] UserRoles -> UserRolesPart - updating part names to conform to a Part convention --HG-- branch : dev rename : src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesDriver.cs => src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs rename : src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesHandler.cs => src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesPartHandler.cs rename : src/Orchard.Web/Modules/Orchard.Roles/Models/UserRoles.cs => src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesPart.cs rename : src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesRecord.cs => src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesPartRecord.cs --- .../DataMigrations/RolesDataMigration.cs | 2 +- ...rRolesDriver.cs => UserRolesPartDriver.cs} | 32 +++++++++---------- ...olesHandler.cs => UserRolesPartHandler.cs} | 10 +++--- .../Models/{UserRoles.cs => UserRolesPart.cs} | 4 +-- ...rRolesRecord.cs => UserRolesPartRecord.cs} | 2 +- .../Modules/Orchard.Roles/Module.txt | 1 + .../Orchard.Roles/Orchard.Roles.csproj | 8 ++--- 7 files changed, 30 insertions(+), 29 deletions(-) rename src/Orchard.Web/Modules/Orchard.Roles/Drivers/{UserRolesDriver.cs => UserRolesPartDriver.cs} (79%) rename src/Orchard.Web/Modules/Orchard.Roles/Handlers/{UserRolesHandler.cs => UserRolesPartHandler.cs} (58%) rename src/Orchard.Web/Modules/Orchard.Roles/Models/{UserRoles.cs => UserRolesPart.cs} (66%) rename src/Orchard.Web/Modules/Orchard.Roles/Models/{UserRolesRecord.cs => UserRolesPartRecord.cs} (80%) diff --git a/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs index af87885e5..43909d2bf 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs @@ -27,7 +27,7 @@ namespace Orchard.Roles.DataMigrations { ); //CREATE TABLE Orchard_Roles_UserRolesRecord (Id integer, UserId INTEGER, Role_id INTEGER, primary key (Id)); - SchemaBuilder.CreateTable("UserRolesRecord", table => table + SchemaBuilder.CreateTable("UserRolesPartRecord", table => table .Column("Id", column => column.PrimaryKey().Identity()) .Column("UserId") .Column("Role_id") diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesDriver.cs b/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs similarity index 79% rename from src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesDriver.cs rename to src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs index fcbc6a8e1..c7ca2e802 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs @@ -12,15 +12,15 @@ using Orchard.UI.Notify; namespace Orchard.Roles.Drivers { [UsedImplicitly] - public class UserRolesDriver : ContentPartDriver { - private readonly IRepository _userRolesRepository; + public class UserRolesPartDriver : ContentPartDriver { + private readonly IRepository _userRolesRepository; private readonly IRoleService _roleService; private readonly INotifier _notifier; private readonly IAuthenticationService _authenticationService; private readonly IAuthorizationService _authorizationService; - public UserRolesDriver( - IRepository userRolesRepository, + public UserRolesPartDriver( + IRepository userRolesRepository, IRoleService roleService, INotifier notifier, IAuthenticationService authenticationService, @@ -41,9 +41,9 @@ namespace Orchard.Roles.Drivers { public Localizer T { get; set; } - protected override DriverResult Editor(UserRoles userRoles) { + protected override DriverResult Editor(UserRolesPart userRolesPart) { // don't show editor without apply roles permission - if (!_authorizationService.TryCheckAccess(Permissions.ApplyRoles, _authenticationService.GetAuthenticatedUser(), userRoles)) + if (!_authorizationService.TryCheckAccess(Permissions.ApplyRoles, _authenticationService.GetAuthenticatedUser(), userRolesPart)) return null; var roles = @@ -51,25 +51,25 @@ namespace Orchard.Roles.Drivers { x => new UserRoleEntry { RoleId = x.Id, Name = x.Name, - Granted = userRoles.Roles.Contains(x.Name) + Granted = userRolesPart.Roles.Contains(x.Name) }); var model = new UserRolesViewModel { - User = userRoles.As(), - UserRoles = userRoles, + User = userRolesPart.As(), + UserRoles = userRolesPart, Roles = roles.ToList(), }; return ContentPartTemplate(model, "Parts/Roles.UserRoles"); } - protected override DriverResult Editor(UserRoles userRoles, IUpdateModel updater) { + protected override DriverResult Editor(UserRolesPart userRolesPart, IUpdateModel updater) { // don't apply editor without apply roles permission - if (!_authorizationService.TryCheckAccess(Permissions.ApplyRoles, _authenticationService.GetAuthenticatedUser(), userRoles)) + if (!_authorizationService.TryCheckAccess(Permissions.ApplyRoles, _authenticationService.GetAuthenticatedUser(), userRolesPart)) return null; var model = new UserRolesViewModel { - User = userRoles.As(), - UserRoles = userRoles, + User = userRolesPart.As(), + UserRoles = userRolesPart, }; if (updater.TryUpdateModel(model, Prefix, null, null)) { @@ -79,12 +79,12 @@ namespace Orchard.Roles.Drivers { var targetRoleRecords = model.Roles.Where(x => x.Granted).Select(x => _roleService.GetRole(x.RoleId)); foreach (var addingRole in targetRoleRecords.Where(x => !currentRoleRecords.Contains(x))) { - _notifier.Warning(T("Adding role {0} to user {1}", addingRole.Name, userRoles.As().UserName)); - _userRolesRepository.Create(new UserRolesRecord { UserId = model.User.Id, Role = addingRole }); + _notifier.Warning(T("Adding role {0} to user {1}", addingRole.Name, userRolesPart.As().UserName)); + _userRolesRepository.Create(new UserRolesPartRecord { UserId = model.User.Id, Role = addingRole }); } foreach (var removingRole in currentUserRoleRecords.Where(x => !targetRoleRecords.Contains(x.Role))) { - _notifier.Warning(T("Removing role {0} from user {1}", removingRole.Role.Name, userRoles.As().UserName)); + _notifier.Warning(T("Removing role {0} from user {1}", removingRole.Role.Name, userRolesPart.As().UserName)); _userRolesRepository.Delete(removingRole); } diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesHandler.cs b/src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesPartHandler.cs similarity index 58% rename from src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesHandler.cs rename to src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesPartHandler.cs index adf65fe39..9ec4b0bcb 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesPartHandler.cs @@ -6,14 +6,14 @@ using Orchard.Roles.Models; namespace Orchard.Roles.Handlers { [UsedImplicitly] - public class UserRolesHandler : ContentHandler { - private readonly IRepository _userRolesRepository; + public class UserRolesPartHandler : ContentHandler { + private readonly IRepository _userRolesRepository; - public UserRolesHandler(IRepository userRolesRepository) { + public UserRolesPartHandler(IRepository userRolesRepository) { _userRolesRepository = userRolesRepository; - Filters.Add(new ActivatingFilter("User")); - OnLoaded((context, userRoles) => { + Filters.Add(new ActivatingFilter("User")); + OnLoaded((context, userRoles) => { userRoles.Roles = _userRolesRepository .Fetch(x => x.UserId == context.ContentItem.Id) .Select(x => x.Role.Name).ToList(); diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Models/UserRoles.cs b/src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesPart.cs similarity index 66% rename from src/Orchard.Web/Modules/Orchard.Roles/Models/UserRoles.cs rename to src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesPart.cs index e2e07ff81..a9f9de831 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Models/UserRoles.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesPart.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using Orchard.ContentManagement; namespace Orchard.Roles.Models { - public class UserRoles : ContentPart, IUserRoles { - public UserRoles() { + public class UserRolesPart : ContentPart, IUserRoles { + public UserRolesPart() { Roles = new List(); } diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesRecord.cs b/src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesPartRecord.cs similarity index 80% rename from src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesRecord.cs rename to src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesPartRecord.cs index 5248a9233..e8efa7cb6 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesRecord.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesPartRecord.cs @@ -1,5 +1,5 @@ namespace Orchard.Roles.Models { - public class UserRolesRecord { + public class UserRolesPartRecord { public virtual int Id { get; set; } public virtual int UserId { get; set; } public virtual RoleRecord Role { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Module.txt b/src/Orchard.Web/Modules/Orchard.Roles/Module.txt index 1cfb543f4..2ef95ec69 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Roles/Module.txt @@ -9,3 +9,4 @@ features: Orchard.Roles: Description: Standard user roles. Category: Core + Dependencies: Orchard.Users \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj index 4a61ae7a5..bcfeff945 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj +++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj @@ -68,17 +68,17 @@ - + - - + + - +