diff --git a/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs index 61fd94b74..bb70a843e 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs @@ -1,4 +1,5 @@ using Orchard.Localization; +using Orchard.Security; using Orchard.UI.Navigation; namespace Orchard.Users { @@ -9,7 +10,7 @@ namespace Orchard.Users { public void GetNavigation(NavigationBuilder builder) { builder.Add(T("Users"), "40", menu => menu.Add(T("Users"), "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Users" }) - .Permission(Permissions.ManageUsers))); + .Permission(StandardPermissions.SiteOwner))); } } } diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs index bdc1f9adc..20f91fa65 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs @@ -40,7 +40,7 @@ namespace Orchard.Users.Controllers { public Localizer T { get; set; } public ActionResult Index() { - if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to list users"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to list users"))) return new HttpUnauthorizedResult(); var users = Services.ContentManager @@ -58,7 +58,7 @@ namespace Orchard.Users.Controllers { } public ActionResult Create() { - if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage users"))) return new HttpUnauthorizedResult(); var user = Services.ContentManager.New("User"); @@ -73,7 +73,7 @@ namespace Orchard.Users.Controllers { [HttpPost, ActionName("Create")] public ActionResult CreatePOST(UserCreateViewModel createModel) { - if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage users"))) return new HttpUnauthorizedResult(); if (!string.IsNullOrEmpty(createModel.UserName)) { @@ -114,7 +114,7 @@ namespace Orchard.Users.Controllers { } public ActionResult Edit(int id) { - if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage users"))) return new HttpUnauthorizedResult(); var user = Services.ContentManager.Get(id); @@ -129,7 +129,7 @@ namespace Orchard.Users.Controllers { [HttpPost, ActionName("Edit")] public ActionResult EditPOST(int id) { - if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage users"))) return new HttpUnauthorizedResult(); var user = Services.ContentManager.Get(id); @@ -169,7 +169,7 @@ namespace Orchard.Users.Controllers { } public ActionResult Delete(int id) { - if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage users"))) return new HttpUnauthorizedResult(); var user = Services.ContentManager.Get(id); @@ -191,7 +191,7 @@ namespace Orchard.Users.Controllers { } public ActionResult SendChallengeEmail(int id) { - if ( !Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")) ) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage users"))) return new HttpUnauthorizedResult(); var user = Services.ContentManager.Get(id); @@ -206,7 +206,7 @@ namespace Orchard.Users.Controllers { } public ActionResult Approve(int id) { - if ( !Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")) ) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage users"))) return new HttpUnauthorizedResult(); var user = Services.ContentManager.Get(id); @@ -220,7 +220,7 @@ namespace Orchard.Users.Controllers { } public ActionResult Moderate(int id) { - if ( !Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to manage users")) ) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage users"))) return new HttpUnauthorizedResult(); var user = Services.ContentManager.Get(id); diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj index a61a69717..ebd7505ae 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj +++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj @@ -69,7 +69,6 @@ - diff --git a/src/Orchard.Web/Modules/Orchard.Users/Permissions.cs b/src/Orchard.Web/Modules/Orchard.Users/Permissions.cs deleted file mode 100644 index 9b58052d2..000000000 --- a/src/Orchard.Web/Modules/Orchard.Users/Permissions.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Collections.Generic; -using JetBrains.Annotations; -using Orchard.Environment.Extensions.Models; -using Orchard.Security.Permissions; - -namespace Orchard.Users { - [UsedImplicitly] - public class Permissions : IPermissionProvider { - public static readonly Permission ManageUsers = new Permission { Description = "Manage users", Name = "ManageUsers" }; - - public virtual Feature Feature { get; set; } - - public IEnumerable GetPermissions() { - return new[] { - ManageUsers, - }; - } - - public IEnumerable GetDefaultStereotypes() { - return new[] { - new PermissionStereotype { - Name = "Administrator", - Permissions = new[] {ManageUsers} - } - }; - } - - } -}