diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs index 738be1b6a..d87f54f1d 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/AdminMenu.cs @@ -1,5 +1,6 @@ using Orchard.Environment.Configuration; using Orchard.Localization; +using Orchard.Security; using Orchard.UI.Navigation; namespace Orchard.MultiTenancy { @@ -20,7 +21,7 @@ namespace Orchard.MultiTenancy { builder.Add(T("Tenants"), "100", menu => menu.Add(T("List"), "0", item => item.Action("Index", "Admin", new { area = "Orchard.MultiTenancy" }) - .Permission(Permissions.ManageTenants))); + .Permission(StandardPermissions.SiteOwner))); } } } diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs index 4881ef86a..a7952c512 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs @@ -5,6 +5,7 @@ using Orchard.Environment.Configuration; using Orchard.Localization; using Orchard.MultiTenancy.Services; using Orchard.MultiTenancy.ViewModels; +using Orchard.Security; using Orchard.UI.Notify; namespace Orchard.MultiTenancy.Controllers { @@ -29,7 +30,7 @@ namespace Orchard.MultiTenancy.Controllers { } public ActionResult Add() { - if (!Services.Authorizer.Authorize(Permissions.ManageTenants, T("Cannot create tenant"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Cannot create tenant"))) return new HttpUnauthorizedResult(); if ( !EnsureDefaultTenant() ) @@ -41,7 +42,7 @@ namespace Orchard.MultiTenancy.Controllers { [HttpPost, ActionName("Add")] public ActionResult AddPOST(TenantAddViewModel viewModel) { try { - if (!Services.Authorizer.Authorize(Permissions.ManageTenants, T("Couldn't create tenant"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Couldn't create tenant"))) return new HttpUnauthorizedResult(); if ( !EnsureDefaultTenant() ) @@ -67,7 +68,7 @@ namespace Orchard.MultiTenancy.Controllers { } public ActionResult Edit(string name) { - if (!Services.Authorizer.Authorize(Permissions.ManageTenants, T("Cannot edit tenant"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Cannot edit tenant"))) return new HttpUnauthorizedResult(); if ( !EnsureDefaultTenant() ) @@ -91,7 +92,7 @@ namespace Orchard.MultiTenancy.Controllers { [HttpPost, ActionName("Edit")] public ActionResult EditPost(TenantEditViewModel viewModel) { try { - if (!Services.Authorizer.Authorize(Permissions.ManageTenants, T("Couldn't edit tenant"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Couldn't edit tenant"))) return new HttpUnauthorizedResult(); if ( !EnsureDefaultTenant() ) @@ -122,7 +123,7 @@ namespace Orchard.MultiTenancy.Controllers { [HttpPost] public ActionResult Disable(string name) { - if (!Services.Authorizer.Authorize(Permissions.ManageTenants, T("Couldn't disable tenant"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Couldn't disable tenant"))) return new HttpUnauthorizedResult(); if ( !EnsureDefaultTenant() ) @@ -140,7 +141,7 @@ namespace Orchard.MultiTenancy.Controllers { [HttpPost] public ActionResult Enable(string name) { - if (!Services.Authorizer.Authorize(Permissions.ManageTenants, T("Couldn't enable tenant"))) + if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Couldn't enable tenant"))) return new HttpUnauthorizedResult(); if ( !EnsureDefaultTenant() ) diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj index 350a06865..9a3a7520e 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj @@ -63,7 +63,6 @@ - diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Permissions.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Permissions.cs deleted file mode 100644 index 74cbb8fad..000000000 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Permissions.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; -using Orchard.Environment.Extensions.Models; -using Orchard.Security.Permissions; - -namespace Orchard.MultiTenancy { - public class Permissions : IPermissionProvider { - public static readonly Permission ManageTenants = new Permission { Description = "Modifying Tenants of a Site", Name = "ManageTenants" }; - - public virtual Feature Feature { get; set; } - - public IEnumerable GetPermissions() { - return new[] { - ManageTenants - }; - } - - public IEnumerable GetDefaultStereotypes() { - return new[] { - new PermissionStereotype { - Name = "Administrator", - Permissions = new[] {ManageTenants} - }, - }; - } - - } -} \ No newline at end of file