diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 199359caf..9c545f68a 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -196,7 +196,6 @@ - diff --git a/src/Orchard.Web/Core/Settings/AdminMenu.cs b/src/Orchard.Web/Core/Settings/AdminMenu.cs index 47739af01..ff81c53b3 100644 --- a/src/Orchard.Web/Core/Settings/AdminMenu.cs +++ b/src/Orchard.Web/Core/Settings/AdminMenu.cs @@ -1,4 +1,5 @@ using Orchard.Localization; +using Orchard.Security; using Orchard.UI.Navigation; namespace Orchard.Core.Settings { @@ -9,7 +10,7 @@ namespace Orchard.Core.Settings { public void GetNavigation(NavigationBuilder builder) { builder.Add(T("Configuration"), "50", menu => menu.Add(T("Settings"), "10", item => item.Action("Index", "Admin", new { area = "Settings" }) - .Permission(Permissions.ManageSettings))); + .Permission(StandardPermissions.SiteOwner))); } } } diff --git a/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs b/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs index 9aa82dfc6..e68c22f4d 100644 --- a/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs @@ -5,6 +5,7 @@ using Orchard.Core.Settings.ViewModels; using Orchard.Localization; using Orchard.ContentManagement; using Orchard.Localization.Services; +using Orchard.Security; using Orchard.Settings; using Orchard.UI.Notify; @@ -28,7 +29,7 @@ namespace Orchard.Core.Settings.Controllers { public Localizer T { get; set; } public ActionResult Index(string tabName) { - if (!Services.Authorizer.Authorize(Permissions.ManageSettings, T("Not authorized to manage settings"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage settings"))) return new HttpUnauthorizedResult(); dynamic model = Services.ContentManager.BuildEditor(_siteService.GetSiteSettings()); @@ -38,7 +39,7 @@ namespace Orchard.Core.Settings.Controllers { [HttpPost, ActionName("Index")] public ActionResult IndexPOST(string tabName) { - if (!Services.Authorizer.Authorize(Permissions.ManageSettings, T("Not authorized to manage settings"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage settings"))) return new HttpUnauthorizedResult(); var site = _siteService.GetSiteSettings(); @@ -56,7 +57,7 @@ namespace Orchard.Core.Settings.Controllers { public ActionResult Culture() { //todo: class and/or method attributes for our auth? - if (!Services.Authorizer.Authorize(Permissions.ManageSettings, T("Not authorized to manage settings"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage settings"))) return new HttpUnauthorizedResult(); var model = new SiteCulturesViewModel { @@ -72,7 +73,7 @@ namespace Orchard.Core.Settings.Controllers { [HttpPost] public ActionResult AddCulture(string systemCultureName, string cultureName) { - if (!Services.Authorizer.Authorize(Permissions.ManageSettings, T("Not authorized to manage settings"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage settings"))) return new HttpUnauthorizedResult(); cultureName = string.IsNullOrWhiteSpace(cultureName) ? systemCultureName : cultureName; @@ -85,7 +86,7 @@ namespace Orchard.Core.Settings.Controllers { [HttpPost] public ActionResult DeleteCulture(string cultureName) { - if (!Services.Authorizer.Authorize(Permissions.ManageSettings, T("Not authorized to manage settings"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to manage settings"))) return new HttpUnauthorizedResult(); _cultureManager.DeleteCulture(cultureName); diff --git a/src/Orchard.Web/Core/Settings/Permissions.cs b/src/Orchard.Web/Core/Settings/Permissions.cs deleted file mode 100644 index f587f8748..000000000 --- a/src/Orchard.Web/Core/Settings/Permissions.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections.Generic; -using Orchard.Environment.Extensions.Models; -using Orchard.Security.Permissions; - -namespace Orchard.Core.Settings { - public class Permissions : IPermissionProvider { - public static readonly Permission ManageSettings = new Permission { Name = "ManageSettings", Description = "Manage site settings" }; - public static readonly Permission ChangeSuperuser = new Permission { Name = "ChangeSuperuser", Description = "Change the superuser for the site" }; - - public virtual Feature Feature { get; set; } - - public IEnumerable GetPermissions() { - return new[] { - ManageSettings, - ChangeSuperuser, - }; - } - - public IEnumerable GetDefaultStereotypes() { - return new[] { - new PermissionStereotype { - Name = "Administrator", - Permissions = new[] {ManageSettings} - } - }; - } - } -}