From cc730fed3dfd64e6a823b33f11123c7e49cd3762 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Wed, 8 Dec 2010 14:04:33 -0800 Subject: [PATCH] 16964 Remove role permissions --HG-- branch : dev --- .../Modules/Orchard.Roles/AdminMenu.cs | 3 +- .../Controllers/AdminController.cs | 14 ++++----- .../Drivers/UserRolesPartDriver.cs | 4 +-- .../Orchard.Roles/Orchard.Roles.csproj | 1 - .../Modules/Orchard.Roles/Permissions.cs | 30 ------------------- 5 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 src/Orchard.Web/Modules/Orchard.Roles/Permissions.cs diff --git a/src/Orchard.Web/Modules/Orchard.Roles/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Roles/AdminMenu.cs index 323fc7f73..c1fde8b66 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/AdminMenu.cs @@ -1,5 +1,6 @@ using Orchard.Localization; using Orchard.UI.Navigation; +using Orchard.Security; namespace Orchard.Roles { public class AdminMenu : INavigationProvider { @@ -9,7 +10,7 @@ namespace Orchard.Roles { public void GetNavigation(NavigationBuilder builder) { builder.Add(T("Users"), "40", menu => menu.Add(T("Roles"), "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Roles" }) - .Permission(Permissions.ManageRoles))); + .Permission(StandardPermissions.SiteOwner))); } } } diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs index 63bfadd5b..f81140e6b 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs @@ -32,7 +32,7 @@ namespace Orchard.Roles.Controllers { public ActionResult Index() { - if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage roles"))) return new HttpUnauthorizedResult(); var model = new RolesIndexViewModel { Rows = _roleService.GetRoles().ToList() }; @@ -42,7 +42,7 @@ namespace Orchard.Roles.Controllers { [HttpPost, ActionName("Index")] public ActionResult IndexPOST() { - if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage roles"))) return new HttpUnauthorizedResult(); try { @@ -61,7 +61,7 @@ namespace Orchard.Roles.Controllers { } public ActionResult Create() { - if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage roles"))) return new HttpUnauthorizedResult(); var model = new RoleCreateViewModel { FeaturePermissions = _roleService.GetInstalledPermissions() }; @@ -70,7 +70,7 @@ namespace Orchard.Roles.Controllers { [HttpPost, ActionName("Create")] public ActionResult CreatePOST() { - if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage roles"))) return new HttpUnauthorizedResult(); var viewModel = new RoleCreateViewModel(); @@ -93,7 +93,7 @@ namespace Orchard.Roles.Controllers { } public ActionResult Edit(int id) { - if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage roles"))) return new HttpUnauthorizedResult(); var role = _roleService.GetRole(id); @@ -119,7 +119,7 @@ namespace Orchard.Roles.Controllers { [HttpPost, ActionName("Edit")] [FormValueRequired("submit.Save")] public ActionResult EditSavePOST(int id) { - if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage roles"))) return new HttpUnauthorizedResult(); var viewModel = new RoleEditViewModel(); @@ -152,7 +152,7 @@ namespace Orchard.Roles.Controllers { [HttpPost] public ActionResult Delete(int id, string returnUrl) { - if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage roles"))) return new HttpUnauthorizedResult(); try { diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs index cedc19a43..f0deee611 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs @@ -44,7 +44,7 @@ namespace Orchard.Roles.Drivers { protected override DriverResult Editor(UserRolesPart userRolesPart, dynamic shapeHelper) { // don't show editor without apply roles permission - if (!_authorizationService.TryCheckAccess(Permissions.ApplyRoles, _authenticationService.GetAuthenticatedUser(), userRolesPart)) + if (!_authorizationService.TryCheckAccess(StandardPermissions.SiteOwner, _authenticationService.GetAuthenticatedUser(), userRolesPart)) return null; return ContentShape("Parts_Roles_UserRoles_Edit", @@ -64,7 +64,7 @@ namespace Orchard.Roles.Drivers { protected override DriverResult Editor(UserRolesPart userRolesPart, IUpdateModel updater, dynamic shapeHelper) { // don't apply editor without apply roles permission - if (!_authorizationService.TryCheckAccess(Permissions.ApplyRoles, _authenticationService.GetAuthenticatedUser(), userRolesPart)) + if (!_authorizationService.TryCheckAccess(StandardPermissions.SiteOwner, _authenticationService.GetAuthenticatedUser(), userRolesPart)) return null; var model = BuildEditorViewModel(userRolesPart); diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj index d4da9d600..7dd2d65f1 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj +++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj @@ -62,7 +62,6 @@ - diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Permissions.cs b/src/Orchard.Web/Modules/Orchard.Roles/Permissions.cs deleted file mode 100644 index d55947cac..000000000 --- a/src/Orchard.Web/Modules/Orchard.Roles/Permissions.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Collections.Generic; -using JetBrains.Annotations; -using Orchard.Environment.Extensions.Models; -using Orchard.Security.Permissions; - -namespace Orchard.Roles { - [UsedImplicitly] - public class Permissions : IPermissionProvider { - public static readonly Permission ManageRoles = new Permission { Description = "Create and manage roles", Name = "ManageRoles" }; - public static readonly Permission ApplyRoles = new Permission { Description = "Assign users to roles", Name = "AssignUsersToRoles", ImpliedBy = new[] { ManageRoles } }; - - public virtual Feature Feature { get; set; } - - public IEnumerable GetPermissions() { - return new[] { - ManageRoles, - ApplyRoles, - }; - } - - public IEnumerable GetDefaultStereotypes() { - return new[] { - new PermissionStereotype { - Name = "Administrator", - Permissions = new[] {ManageRoles, ApplyRoles} - } - }; - } - } -}