From 18dd0d90962b34269c2487e729e5de0a27658e33 Mon Sep 17 00:00:00 2001 From: robvde Date: Wed, 10 Oct 2012 21:42:24 +0400 Subject: [PATCH] Fixed: flipped the behavior of "allow Tenant to create domains" to "Not allow Tenant to create domains" within hosting plans. Existing beta users will need to update their plans --- .../WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs | 2 +- .../App_GlobalResources/WebsitePanel_SharedResources.ascx.resx | 2 +- .../WebsitePanel/DomainsAddDomainSelectType.ascx.cs | 2 +- .../DesktopModules/WebsitePanel/DomainsEditDomain.ascx.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs index 0be7a9d1..e8a6fcc0 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs @@ -50,7 +50,7 @@ order by rg.groupOrder public const string OS_MINIMUMTASKINTERVAL = "OS.MinimumTaskInterval"; // Minimum Tasks Interval, minutes public const string OS_APPINSTALLER = "OS.AppInstaller"; // Applications Installer public const string OS_EXTRAAPPLICATIONS = "OS.ExtraApplications"; // Extra Application Packs - public const string OS_ALLOWTENANTCREATEDOMAINS = "OS.AllowTenantCreateDomains"; // Allow tenant to create top level domains + public const string OS_NOTALLOWTENANTCREATEDOMAINS = "OS.AllowTenantCreateDomains"; // Do not Allow tenant to create top level domains public const string WEB_SITES = "Web.Sites"; // Web Sites public const string WEB_ASPNET11 = "Web.AspNet11"; // ASP.NET 1.1 public const string WEB_ASPNET20 = "Web.AspNet20"; // ASP.NET 2.0 diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx index 7bc1ffaa..0270d53b 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx @@ -1600,7 +1600,7 @@ File Manager - Tenant Top-Level Domain creation Allowed + Disable Tenant To Create Top-Level Domain SharePoint Groups diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomainSelectType.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomainSelectType.ascx.cs index 91a8bd2f..d18afc95 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomainSelectType.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomainSelectType.ascx.cs @@ -63,7 +63,7 @@ namespace WebsitePanel.Portal { if (user.Role == UserRole.User) { - DomainLink.Enabled = Utils.CheckQouta(Quotas.OS_ALLOWTENANTCREATEDOMAINS, cntx); + DomainLink.Enabled = !Utils.CheckQouta(Quotas.OS_NOTALLOWTENANTCREATEDOMAINS, cntx); } } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsEditDomain.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsEditDomain.ascx.cs index cb1a3f62..8a03ef2a 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsEditDomain.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsEditDomain.ascx.cs @@ -153,7 +153,7 @@ namespace WebsitePanel.Portal { if (user.Role == UserRole.User) { - btnDelete.Enabled = Utils.CheckQouta(Quotas.OS_ALLOWTENANTCREATEDOMAINS, cntx); + btnDelete.Enabled = !Utils.CheckQouta(Quotas.OS_NOTALLOWTENANTCREATEDOMAINS, cntx); } } }