From 734ff40e30830a65760663e194d71e17e81fd843 Mon Sep 17 00:00:00 2001 From: robvde Date: Thu, 4 Oct 2012 01:26:14 +0400 Subject: [PATCH] Fixed: DomainPointer gets not deleted when deleting site --- .../Code/Servers/ServerController.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs index 1bb91bf7..6ab389c3 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs @@ -2016,13 +2016,17 @@ namespace WebsitePanel.EnterpriseServer return BusinessErrorCodes.ERROR_ORGANIZATION_DOMAIN_IS_IN_USE; } - List domains = GetDomainsByZoneId(domain.ZoneItemId); - foreach (DomainInfo d in domains) + + if (!domain.IsDomainPointer) { - if (d.WebSiteId > 0) + List domains = GetDomainsByZoneId(domain.ZoneItemId); + foreach (DomainInfo d in domains) { - TaskManager.WriteError("Domain points to the existing web site"); - return BusinessErrorCodes.ERROR_DOMAIN_POINTS_TO_WEB_SITE; + if (d.WebSiteId > 0) + { + TaskManager.WriteError("Domain points to the existing web site"); + return BusinessErrorCodes.ERROR_DOMAIN_POINTS_TO_WEB_SITE; + } } }