ResourceGroups updated with ShowGRoup field. By setting this field to zero
the resourcegroup will not show up. This is typically done to hide those providers from an deployment you dont want to support. To remove items from the search list set the Searchable field to 'False' in ServiceItemTypes
This commit is contained in:
robvde
parent
5662b81116
commit
3c3374d8ae
2 changed files with 229 additions and 31 deletions
|
|
@ -10604,6 +10604,7 @@ CREATE TABLE [dbo].[ResourceGroups](
|
|||
[GroupName] [nvarchar](100) COLLATE Latin1_General_CI_AS NOT NULL,
|
||||
[GroupOrder] [int] NOT NULL,
|
||||
[GroupController] [nvarchar](1000) COLLATE Latin1_General_CI_AS NULL,
|
||||
[ShowGroup] [bit] NULL,
|
||||
CONSTRAINT [PK_ResourceGroups] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[GroupID] ASC
|
||||
|
|
@ -10611,49 +10612,49 @@ CREATE TABLE [dbo].[ResourceGroups](
|
|||
)
|
||||
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (1, N'OS', 1, N'WebsitePanel.EnterpriseServer.OperatingSystemController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (1, N'OS', 1, N'WebsitePanel.EnterpriseServer.OperatingSystemController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (2, N'Web', 2, N'WebsitePanel.EnterpriseServer.WebServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (2, N'Web', 2, N'WebsitePanel.EnterpriseServer.WebServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (3, N'FTP', 3, N'WebsitePanel.EnterpriseServer.FtpServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (3, N'FTP', 3, N'WebsitePanel.EnterpriseServer.FtpServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (4, N'Mail', 4, N'WebsitePanel.EnterpriseServer.MailServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (4, N'Mail', 4, N'WebsitePanel.EnterpriseServer.MailServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (5, N'MsSQL2000', 8, N'WebsitePanel.EnterpriseServer.DatabaseServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (5, N'MsSQL2000', 8, N'WebsitePanel.EnterpriseServer.DatabaseServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (6, N'MySQL4', 12, N'WebsitePanel.EnterpriseServer.DatabaseServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (6, N'MySQL4', 12, N'WebsitePanel.EnterpriseServer.DatabaseServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (7, N'DNS', 17, N'WebsitePanel.EnterpriseServer.DnsServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (7, N'DNS', 17, N'WebsitePanel.EnterpriseServer.DnsServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (8, N'Statistics', 18, N'WebsitePanel.EnterpriseServer.StatisticsServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (8, N'Statistics', 18, N'WebsitePanel.EnterpriseServer.StatisticsServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (9, N'SharePoint', 14, N'WebsitePanel.EnterpriseServer.SharePointServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (9, N'SharePoint', 14, N'WebsitePanel.EnterpriseServer.SharePointServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (10, N'MsSQL2005', 9, N'WebsitePanel.EnterpriseServer.DatabaseServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (10, N'MsSQL2005', 9, N'WebsitePanel.EnterpriseServer.DatabaseServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (11, N'MySQL5', 13, N'WebsitePanel.EnterpriseServer.DatabaseServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (11, N'MySQL5', 13, N'WebsitePanel.EnterpriseServer.DatabaseServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (12, N'Exchange', 5, NULL)
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (12, N'Exchange', 5, NULL, 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (13, N'Hosted Organizations', 6, NULL)
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (13, N'Hosted Organizations', 6, NULL, 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (20, N'Hosted SharePoint', 15, N'WebsitePanel.EnterpriseServer.HostedSharePointServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (20, N'Hosted SharePoint', 15, N'WebsitePanel.EnterpriseServer.HostedSharePointServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (21, N'Hosted CRM', 16, NULL)
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (21, N'Hosted CRM', 16, NULL, 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (22, N'MsSQL2008', 10, N'WebsitePanel.EnterpriseServer.DatabaseServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (22, N'MsSQL2008', 10, N'WebsitePanel.EnterpriseServer.DatabaseServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (23, N'MsSQL2012', 11, N'WebsitePanel.EnterpriseServer.DatabaseServerController')
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (23, N'MsSQL2012', 11, N'WebsitePanel.EnterpriseServer.DatabaseServerController', 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (30, N'VPS', 19, NULL)
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (30, N'VPS', 19, NULL, 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (31, N'BlackBerry', 21, NULL)
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (31, N'BlackBerry', 21, NULL, 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (32, N'OCS', 22, NULL)
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (32, N'OCS', 22, NULL, 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (41, N'Lync',23, NULL)
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (41, N'Lync',23, NULL, 1)
|
||||
GO
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (40, N'VPSForPC', 20, NULL)
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController]) VALUES (40, N'VPSForPC', 20, NULL, 1)
|
||||
GO
|
||||
SET ANSI_NULLS ON
|
||||
GO
|
||||
|
|
@ -26230,7 +26231,7 @@ GO
|
|||
|
||||
|
||||
|
||||
CREATE PROCEDURE GetHostingPlanQuotas
|
||||
CREATE PROCEDURE [dbo].[GetHostingPlanQuotas]
|
||||
(
|
||||
@ActorID int,
|
||||
@PlanID int,
|
||||
|
|
@ -26260,8 +26261,9 @@ SELECT
|
|||
dbo.GetPackageAllocatedResource(@PackageID, RG.GroupID, @ServerID) AS ParentEnabled,
|
||||
ISNULL(HPR.CalculateDiskSpace, 1) AS CalculateDiskSpace,
|
||||
ISNULL(HPR.CalculateBandwidth, 1) AS CalculateBandwidth
|
||||
FROM ResourceGroups AS RG
|
||||
FROM ResourceGroups AS RG
|
||||
LEFT OUTER JOIN HostingPlanResources AS HPR ON RG.GroupID = HPR.GroupID AND HPR.PlanID = @PlanID
|
||||
WHERE (ShowGroup = 1)
|
||||
ORDER BY RG.GroupOrder
|
||||
|
||||
-- get quotas by groups
|
||||
|
|
@ -26310,7 +26312,6 @@ RETURN
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
GO
|
||||
|
|
@ -40497,7 +40498,7 @@ GO
|
|||
|
||||
|
||||
|
||||
CREATE PROCEDURE GetRawServicesByServerID
|
||||
CREATE PROCEDURE [dbo].[GetRawServicesByServerID]
|
||||
(
|
||||
@ActorID int,
|
||||
@ServerID int
|
||||
|
|
@ -40513,7 +40514,7 @@ SELECT
|
|||
GroupID,
|
||||
GroupName
|
||||
FROM ResourceGroups
|
||||
WHERE @IsAdmin = 1
|
||||
WHERE @IsAdmin = 1 AND (ShowGroup = 1)
|
||||
ORDER BY GroupOrder
|
||||
|
||||
-- services
|
||||
|
|
@ -40532,7 +40533,7 @@ WHERE
|
|||
AND @IsAdmin = 1
|
||||
ORDER BY RG.GroupOrder
|
||||
|
||||
RETURN
|
||||
RETURN
|
||||
|
||||
|
||||
|
||||
|
|
@ -44000,7 +44001,7 @@ GO
|
|||
|
||||
|
||||
|
||||
CREATE PROCEDURE GetVirtualServices
|
||||
CREATE PROCEDURE [dbo].[GetVirtualServices]
|
||||
(
|
||||
@ActorID int,
|
||||
@ServerID int
|
||||
|
|
@ -44021,7 +44022,7 @@ SELECT
|
|||
FROM ResourceGroups AS RG
|
||||
LEFT OUTER JOIN VirtualGroups AS VRG ON RG.GroupID = VRG.GroupID AND VRG.ServerID = @ServerID
|
||||
WHERE
|
||||
@IsAdmin = 1
|
||||
@IsAdmin = 1 AND (ShowGroup = 1)
|
||||
ORDER BY RG.GroupOrder
|
||||
|
||||
-- services
|
||||
|
|
@ -44040,7 +44041,7 @@ WHERE
|
|||
VS.ServerID = @ServerID
|
||||
AND @IsAdmin = 1
|
||||
|
||||
RETURN
|
||||
RETURN
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -987,6 +987,14 @@ ALTER TABLE [dbo].[GlobalDnsRecords] ADD
|
|||
END
|
||||
GO
|
||||
|
||||
IF NOT EXISTS(select 1 from sys.columns COLS INNER JOIN sys.objects OBJS ON OBJS.object_id=COLS.object_id and OBJS.type='U' AND OBJS.name='ResourceGroups' AND COLS.name='ShowGroup')
|
||||
BEGIN
|
||||
ALTER TABLE [dbo].[ResourceGroups] ADD [ShowGroup] [bit] NULL
|
||||
|
||||
UPDATE [dbo].[ResourceGroups] SET ShowGRoup=1
|
||||
END
|
||||
GO
|
||||
|
||||
|
||||
|
||||
ALTER PROCEDURE [dbo].[AddDnsRecord]
|
||||
|
|
@ -3444,3 +3452,192 @@ UPDATE LyncUserPlans SET IsDefault=1 WHERE LyncUserPlanId=@LyncUserPlanId
|
|||
RETURN'
|
||||
END
|
||||
GO
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
ALTER PROCEDURE [dbo].[GetHostingPlanQuotas]
|
||||
(
|
||||
@ActorID int,
|
||||
@PlanID int,
|
||||
@PackageID int,
|
||||
@ServerID int
|
||||
)
|
||||
AS
|
||||
|
||||
-- check rights
|
||||
IF dbo.CheckActorParentPackageRights(@ActorID, @PackageID) = 0
|
||||
RAISERROR('You are not allowed to access this package', 16, 1)
|
||||
|
||||
DECLARE @IsAddon bit
|
||||
|
||||
IF @ServerID = 0
|
||||
SELECT @ServerID = ServerID FROM Packages
|
||||
WHERE PackageID = @PackageID
|
||||
|
||||
-- get resource groups
|
||||
SELECT
|
||||
RG.GroupID,
|
||||
RG.GroupName,
|
||||
CASE
|
||||
WHEN HPR.CalculateDiskSpace IS NULL THEN CAST(0 as bit)
|
||||
ELSE CAST(1 as bit)
|
||||
END AS Enabled,
|
||||
dbo.GetPackageAllocatedResource(@PackageID, RG.GroupID, @ServerID) AS ParentEnabled,
|
||||
ISNULL(HPR.CalculateDiskSpace, 1) AS CalculateDiskSpace,
|
||||
ISNULL(HPR.CalculateBandwidth, 1) AS CalculateBandwidth
|
||||
FROM ResourceGroups AS RG
|
||||
LEFT OUTER JOIN HostingPlanResources AS HPR ON RG.GroupID = HPR.GroupID AND HPR.PlanID = @PlanID
|
||||
WHERE (ShowGroup = 1)
|
||||
ORDER BY RG.GroupOrder
|
||||
|
||||
-- get quotas by groups
|
||||
SELECT
|
||||
Q.QuotaID,
|
||||
Q.GroupID,
|
||||
Q.QuotaName,
|
||||
Q.QuotaDescription,
|
||||
Q.QuotaTypeID,
|
||||
ISNULL(HPQ.QuotaValue, 0) AS QuotaValue,
|
||||
dbo.GetPackageAllocatedQuota(@PackageID, Q.QuotaID) AS ParentQuotaValue
|
||||
FROM Quotas AS Q
|
||||
LEFT OUTER JOIN HostingPlanQuotas AS HPQ ON Q.QuotaID = HPQ.QuotaID AND HPQ.PlanID = @PlanID
|
||||
ORDER BY Q.QuotaOrder
|
||||
RETURN
|
||||
GO
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
ALTER PROCEDURE [dbo].[GetRawServicesByServerID]
|
||||
(
|
||||
@ActorID int,
|
||||
@ServerID int
|
||||
)
|
||||
AS
|
||||
|
||||
-- check rights
|
||||
DECLARE @IsAdmin bit
|
||||
SET @IsAdmin = dbo.CheckIsUserAdmin(@ActorID)
|
||||
|
||||
-- resource groups
|
||||
SELECT
|
||||
GroupID,
|
||||
GroupName
|
||||
FROM ResourceGroups
|
||||
WHERE @IsAdmin = 1 AND (ShowGroup = 1)
|
||||
ORDER BY GroupOrder
|
||||
|
||||
-- services
|
||||
SELECT
|
||||
S.ServiceID,
|
||||
S.ServerID,
|
||||
S.ServiceName,
|
||||
S.Comments,
|
||||
RG.GroupID,
|
||||
PROV.DisplayName AS ProviderName
|
||||
FROM Services AS S
|
||||
INNER JOIN Providers AS PROV ON S.ProviderID = PROV.ProviderID
|
||||
INNER JOIN ResourceGroups AS RG ON PROV.GroupID = RG.GroupID
|
||||
WHERE
|
||||
S.ServerID = @ServerID
|
||||
AND @IsAdmin = 1
|
||||
ORDER BY RG.GroupOrder
|
||||
|
||||
RETURN
|
||||
GO
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
ALTER PROCEDURE [dbo].[GetVirtualServices]
|
||||
(
|
||||
@ActorID int,
|
||||
@ServerID int
|
||||
)
|
||||
AS
|
||||
|
||||
-- check rights
|
||||
DECLARE @IsAdmin bit
|
||||
SET @IsAdmin = dbo.CheckIsUserAdmin(@ActorID)
|
||||
|
||||
-- virtual groups
|
||||
SELECT
|
||||
VRG.VirtualGroupID,
|
||||
RG.GroupID,
|
||||
RG.GroupName,
|
||||
ISNULL(VRG.DistributionType, 1) AS DistributionType,
|
||||
ISNULL(VRG.BindDistributionToPrimary, 1) AS BindDistributionToPrimary
|
||||
FROM ResourceGroups AS RG
|
||||
LEFT OUTER JOIN VirtualGroups AS VRG ON RG.GroupID = VRG.GroupID AND VRG.ServerID = @ServerID
|
||||
WHERE
|
||||
@IsAdmin = 1 AND (ShowGroup = 1)
|
||||
ORDER BY RG.GroupOrder
|
||||
|
||||
-- services
|
||||
SELECT
|
||||
VS.ServiceID,
|
||||
S.ServiceName,
|
||||
S.Comments,
|
||||
P.GroupID,
|
||||
P.DisplayName,
|
||||
SRV.ServerName
|
||||
FROM VirtualServices AS VS
|
||||
INNER JOIN Services AS S ON VS.ServiceID = S.ServiceID
|
||||
INNER JOIN Servers AS SRV ON S.ServerID = SRV.ServerID
|
||||
INNER JOIN Providers AS P ON S.ProviderID = P.ProviderID
|
||||
WHERE
|
||||
VS.ServerID = @ServerID
|
||||
AND @IsAdmin = 1
|
||||
|
||||
RETURN
|
||||
GO
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue