lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-24 05:23:33 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Ensuring the current tenant (Default) cannot have its state changed

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-05-11 16:21:00 -07:00
parent 5aad2aa8ab
commit 89ffa5d5bf
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs
View File

@@ -11,9 +11,11 @@ namespace Orchard.MultiTenancy.Controllers {
[ValidateInput(false)] [ValidateInput(false)]
public class AdminController : Controller { public class AdminController : Controller {
private readonly ITenantService _tenantService; private readonly ITenantService _tenantService;
private readonly ShellSettings _thisShellSettings;
public AdminController(ITenantService tenantService, IOrchardServices orchardServices) { public AdminController(ITenantService tenantService, IOrchardServices orchardServices, ShellSettings shellSettings) {
_tenantService = tenantService; _tenantService = tenantService;
_thisShellSettings = shellSettings;
Services = orchardServices; Services = orchardServices;
T = NullLocalizer.Instance; T = NullLocalizer.Instance;
} }
@@ -60,7 +62,7 @@ namespace Orchard.MultiTenancy.Controllers {
var tenant = _tenantService.GetTenants().FirstOrDefault(ss => ss.Name == shellSettings.Name); var tenant = _tenantService.GetTenants().FirstOrDefault(ss => ss.Name == shellSettings.Name);
if (tenant != null) { if (tenant != null && tenant.Name != _thisShellSettings.Name) {
tenant.State.CurrentState = TenantState.State.Disabled; tenant.State.CurrentState = TenantState.State.Disabled;
_tenantService.UpdateTenant(tenant); _tenantService.UpdateTenant(tenant);
} }
@@ -75,7 +77,7 @@ namespace Orchard.MultiTenancy.Controllers {
var tenant = _tenantService.GetTenants().FirstOrDefault(ss => ss.Name == shellSettings.Name); var tenant = _tenantService.GetTenants().FirstOrDefault(ss => ss.Name == shellSettings.Name);
if (tenant != null) { if (tenant != null && tenant.Name != _thisShellSettings.Name) {
tenant.State.CurrentState = TenantState.State.Running; tenant.State.CurrentState = TenantState.State.Running;
_tenantService.UpdateTenant(tenant); _tenantService.UpdateTenant(tenant);
} }