lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Addin new Category property to Permission

Browse Source 
- Automatically creates a Category if non is provided, using the previous text pattern

--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2010-10-01 14:45:43 -07:00
parent 8162e6ee7a
commit eecd5cd7f5
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Orchard.Web/Modules/Orchard.Roles/Services/RoleService.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using Orchard.Data; using Orchard.Data;
using Orchard.Environment.Extensions.Models; using Orchard.Localization;
using Orchard.Logging; using Orchard.Logging;
using Orchard.Roles.Models; using Orchard.Roles.Models;
using Orchard.Security.Permissions; using Orchard.Security.Permissions;
@@ -22,8 +22,10 @@ namespace Orchard.Roles.Services {
_permissionRepository = permissionRepository; _permissionRepository = permissionRepository;
_permissionProviders = permissionProviders; _permissionProviders = permissionProviders;
Logger = NullLogger.Instance; Logger = NullLogger.Instance;
T = NullLocalizer.Instance;
} }
public Localizer T { get; set; }
public ILogger Logger { get; set; } public ILogger Logger { get; set; }
public IEnumerable<RoleRecord> GetRoles() { public IEnumerable<RoleRecord> GetRoles() {
@@ -105,11 +107,16 @@ namespace Orchard.Roles.Services {
foreach (var permissionProvider in _permissionProviders) { foreach (var permissionProvider in _permissionProviders) {
var featureName = permissionProvider.Feature.Descriptor.Name; var featureName = permissionProvider.Feature.Descriptor.Name;
var permissions = permissionProvider.GetPermissions(); var permissions = permissionProvider.GetPermissions();
foreach(var permission in permissions) {
var category = permission.Category;
if (installedPermissions.ContainsKey(featureName)) string title = String.IsNullOrWhiteSpace(category) ? T("{0} Feature", featureName).Text : T(category).Text;
installedPermissions[featureName] = installedPermissions[featureName].Concat(permissions);
else if ( installedPermissions.ContainsKey(title) )
installedPermissions.Add(featureName, permissions); installedPermissions[title] = installedPermissions[title].Concat( new [] {permission});
else
installedPermissions.Add(title, permissions);
}
} }
return installedPermissions; return installedPermissions;

6
src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml
View File

@@ -11,9 +11,9 @@
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>@T("Permissions")</legend> <legend>@T("Permissions")</legend>
@foreach (var featureName in Model.FeaturePermissions.Keys) { @foreach (var category in Model.FeaturePermissions.Keys) {
<fieldset> <fieldset>
<legend>@T("{0} Feature", featureName)</legend> <legend>@category</legend>
<table class="items"> <table class="items">
<colgroup> <colgroup>
<col id="Col1" /> <col id="Col1" />
@@ -26,7 +26,7 @@
<th scope="col">@T("Effective")</th> <th scope="col">@T("Effective")</th>
</tr> </tr>
</thead> </thead>
@foreach (var permission in Model.FeaturePermissions[featureName]) { @foreach (var permission in Model.FeaturePermissions[category]) {
<tr> <tr>
<td>@permission.Description</td> <td>@permission.Description</td>
<td style="width:60px;"> <td style="width:60px;">

1
src/Orchard/Security/Permissions/Permission.cs
View File

@@ -4,6 +4,7 @@ namespace Orchard.Security.Permissions {
public class Permission { public class Permission {
public string Name { get; set; } public string Name { get; set; }
public string Description { get; set; } public string Description { get; set; }
public string Category { get; set; }
public IEnumerable<Permission> ImpliedBy { get; set; } public IEnumerable<Permission> ImpliedBy { get; set; }
public bool RequiresOwnership { get; set; } public bool RequiresOwnership { get; set; }