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

UserRoles -> UserRolesPart

Browse Source 
- updating part names to conform to a <name>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
This commit is contained in:
Nathan Heskew
2010-07-22 14:33:25 -07:00
parent 118311ced5
commit 77e73c70e1
7 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs
View File

@@ -27,7 +27,7 @@ namespace Orchard.Roles.DataMigrations {
); );
//CREATE TABLE Orchard_Roles_UserRolesRecord (Id integer, UserId INTEGER, Role_id INTEGER, primary key (Id)); //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<int>("Id", column => column.PrimaryKey().Identity()) .Column<int>("Id", column => column.PrimaryKey().Identity())
.Column<int>("UserId") .Column<int>("UserId")
.Column<int>("Role_id") .Column<int>("Role_id")

32
src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesDriver.cs → src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs
View File

@@ -12,15 +12,15 @@ using Orchard.UI.Notify;
namespace Orchard.Roles.Drivers { namespace Orchard.Roles.Drivers {
[UsedImplicitly] [UsedImplicitly]
public class UserRolesDriver : ContentPartDriver<UserRoles> { public class UserRolesPartDriver : ContentPartDriver<UserRolesPart> {
private readonly IRepository<UserRolesRecord> _userRolesRepository; private readonly IRepository<UserRolesPartRecord> _userRolesRepository;
private readonly IRoleService _roleService; private readonly IRoleService _roleService;
private readonly INotifier _notifier; private readonly INotifier _notifier;
private readonly IAuthenticationService _authenticationService; private readonly IAuthenticationService _authenticationService;
private readonly IAuthorizationService _authorizationService; private readonly IAuthorizationService _authorizationService;
public UserRolesDriver( public UserRolesPartDriver(
IRepository<UserRolesRecord> userRolesRepository, IRepository<UserRolesPartRecord> userRolesRepository,
IRoleService roleService, IRoleService roleService,
INotifier notifier, INotifier notifier,
IAuthenticationService authenticationService, IAuthenticationService authenticationService,
@@ -41,9 +41,9 @@ namespace Orchard.Roles.Drivers {
public Localizer T { get; set; } 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 // 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; return null;
var roles = var roles =
@@ -51,25 +51,25 @@ namespace Orchard.Roles.Drivers {
x => new UserRoleEntry { x => new UserRoleEntry {
RoleId = x.Id, RoleId = x.Id,
Name = x.Name, Name = x.Name,
Granted = userRoles.Roles.Contains(x.Name) Granted = userRolesPart.Roles.Contains(x.Name)
}); });
var model = new UserRolesViewModel { var model = new UserRolesViewModel {
User = userRoles.As<IUser>(), User = userRolesPart.As<IUser>(),
UserRoles = userRoles, UserRoles = userRolesPart,
Roles = roles.ToList(), Roles = roles.ToList(),
}; };
return ContentPartTemplate(model, "Parts/Roles.UserRoles"); 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 // 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; return null;
var model = new UserRolesViewModel { var model = new UserRolesViewModel {
User = userRoles.As<IUser>(), User = userRolesPart.As<IUser>(),
UserRoles = userRoles, UserRoles = userRolesPart,
}; };
if (updater.TryUpdateModel(model, Prefix, null, null)) { 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)); var targetRoleRecords = model.Roles.Where(x => x.Granted).Select(x => _roleService.GetRole(x.RoleId));
foreach (var addingRole in targetRoleRecords.Where(x => !currentRoleRecords.Contains(x))) { foreach (var addingRole in targetRoleRecords.Where(x => !currentRoleRecords.Contains(x))) {
_notifier.Warning(T("Adding role {0} to user {1}", addingRole.Name, userRoles.As<IUser>().UserName)); _notifier.Warning(T("Adding role {0} to user {1}", addingRole.Name, userRolesPart.As<IUser>().UserName));
_userRolesRepository.Create(new UserRolesRecord { UserId = model.User.Id, Role = addingRole }); _userRolesRepository.Create(new UserRolesPartRecord { UserId = model.User.Id, Role = addingRole });
} }
foreach (var removingRole in currentUserRoleRecords.Where(x => !targetRoleRecords.Contains(x.Role))) { 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<IUser>().UserName)); _notifier.Warning(T("Removing role {0} from user {1}", removingRole.Role.Name, userRolesPart.As<IUser>().UserName));
_userRolesRepository.Delete(removingRole); _userRolesRepository.Delete(removingRole);
} }

10
src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesHandler.cs → src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesPartHandler.cs
View File

@@ -6,14 +6,14 @@ using Orchard.Roles.Models;
namespace Orchard.Roles.Handlers { namespace Orchard.Roles.Handlers {
[UsedImplicitly] [UsedImplicitly]
public class UserRolesHandler : ContentHandler { public class UserRolesPartHandler : ContentHandler {
private readonly IRepository<UserRolesRecord> _userRolesRepository; private readonly IRepository<UserRolesPartRecord> _userRolesRepository;
public UserRolesHandler(IRepository<UserRolesRecord> userRolesRepository) { public UserRolesPartHandler(IRepository<UserRolesPartRecord> userRolesRepository) {
_userRolesRepository = userRolesRepository; _userRolesRepository = userRolesRepository;
Filters.Add(new ActivatingFilter<UserRoles>("User")); Filters.Add(new ActivatingFilter<UserRolesPart>("User"));
OnLoaded<UserRoles>((context, userRoles) => { OnLoaded<UserRolesPart>((context, userRoles) => {
userRoles.Roles = _userRolesRepository userRoles.Roles = _userRolesRepository
.Fetch(x => x.UserId == context.ContentItem.Id) .Fetch(x => x.UserId == context.ContentItem.Id)
.Select(x => x.Role.Name).ToList(); .Select(x => x.Role.Name).ToList();

4
src/Orchard.Web/Modules/Orchard.Roles/Models/UserRoles.cs → src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesPart.cs
View File

@@ -2,8 +2,8 @@ using System.Collections.Generic;
using Orchard.ContentManagement; using Orchard.ContentManagement;
namespace Orchard.Roles.Models { namespace Orchard.Roles.Models {
public class UserRoles : ContentPart, IUserRoles { public class UserRolesPart : ContentPart, IUserRoles {
public UserRoles() { public UserRolesPart() {
Roles = new List<string>(); Roles = new List<string>();
} }

2
src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesRecord.cs → src/Orchard.Web/Modules/Orchard.Roles/Models/UserRolesPartRecord.cs
View File

@@ -1,5 +1,5 @@
namespace Orchard.Roles.Models { namespace Orchard.Roles.Models {
public class UserRolesRecord { public class UserRolesPartRecord {
public virtual int Id { get; set; } public virtual int Id { get; set; }
public virtual int UserId { get; set; } public virtual int UserId { get; set; }
public virtual RoleRecord Role { get; set; } public virtual RoleRecord Role { get; set; }

1
src/Orchard.Web/Modules/Orchard.Roles/Module.txt
View File

@@ -9,3 +9,4 @@ features:
Orchard.Roles: Orchard.Roles:
Description: Standard user roles. Description: Standard user roles.
Category: Core Category: Core
Dependencies: Orchard.Users

8
src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
View File

@@ -68,17 +68,17 @@
<Compile Include="AdminMenu.cs" /> <Compile Include="AdminMenu.cs" />
<Compile Include="Controllers\AdminController.cs" /> <Compile Include="Controllers\AdminController.cs" />
<Compile Include="DataMigrations\RolesDataMigration.cs" /> <Compile Include="DataMigrations\RolesDataMigration.cs" />
<Compile Include="Drivers\UserRolesDriver.cs" /> <Compile Include="Drivers\UserRolesPartDriver.cs" />
<Compile Include="DefaultRoleUpdater.cs" /> <Compile Include="DefaultRoleUpdater.cs" />
<Compile Include="Models\IUserRoles.cs" /> <Compile Include="Models\IUserRoles.cs" />
<Compile Include="Models\UserSimulation.cs" /> <Compile Include="Models\UserSimulation.cs" />
<Compile Include="Permissions.cs" /> <Compile Include="Permissions.cs" />
<Compile Include="Models\PermissionRecord.cs" /> <Compile Include="Models\PermissionRecord.cs" />
<Compile Include="Models\RoleRecord.cs" /> <Compile Include="Models\RoleRecord.cs" />
<Compile Include="Models\UserRoles.cs" /> <Compile Include="Models\UserRolesPart.cs" />
<Compile Include="Handlers\UserRolesHandler.cs" /> <Compile Include="Handlers\UserRolesPartHandler.cs" />
<Compile Include="Models\RolesPermissionsRecord.cs" /> <Compile Include="Models\RolesPermissionsRecord.cs" />
<Compile Include="Models\UserRolesRecord.cs" /> <Compile Include="Models\UserRolesPartRecord.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Services\IRoleService.cs" /> <Compile Include="Services\IRoleService.cs" />
<Compile Include="Services\RolesBasedAuthorizationService.cs" /> <Compile Include="Services\RolesBasedAuthorizationService.cs" />