diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index c5a40d7f..dc73f195 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -449,4 +449,8 @@ BEGIN INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (1401, 41, N'Lync2013', N'Microsoft Lync Server 2013 Multitenant Hosting Pack', N'WebsitePanel.Providers.HostedSolution.Lync2013, WebsitePanel.Providers.HostedSolution.Lync2013', N'Lync', NULL) END -GO \ No newline at end of file +GO + +-- add Application Pools Restart Quota +INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (411, 2, 13, N'Web.AppPoolsRestart', N'Application Pools Restart', 1, 0, NULL, NULL) +GO diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs index 0632b962..34bb6a4c 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs @@ -65,7 +65,8 @@ order by rg.groupOrder public const string WEB_SECURITY = "Web.Security"; // Custom Security Settings public const string WEB_DEFAULTDOCS = "Web.DefaultDocs"; // Custom Default Documents public const string WEB_APPPOOLS = "Web.AppPools"; // Dedicated Application Pools - public const string WEB_HEADERS = "Web.Headers"; // Custom Headers + public const string WEB_APPPOOLSRESTART = "Web.AppPoolsRestart"; // Application Pools Restart + public const string WEB_HEADERS = "Web.Headers"; // Custom Headers public const string WEB_ERRORS = "Web.Errors"; // Custom Errors public const string WEB_MIME = "Web.Mime"; // Custom MIME Types public const string WEB_CGIBIN = "Web.CgiBin"; // CGI-BIN Folder 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 46bf2425..ac187873 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx @@ -1623,6 +1623,9 @@ Dedicated Application Pools + + Application Pools Restart + ColdFusion diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx index 6b8e3074..0c6e28dd 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx @@ -191,12 +191,14 @@ - - - + + + + + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs index 1ffd70b7..425c0a20 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs @@ -265,6 +265,8 @@ namespace WebsitePanel.Portal ToggleFrontPageControls(site.FrontPageInstalled); } + AppPoolRestartPanel.Visible = Utils.CheckQouta(Quotas.WEB_APPPOOLSRESTART, cntx); + // bind controls webSitesHomeFolderControl.BindWebItem(PackageId, site); webSitesSecuredFoldersControl.BindSecuredFolders(site); diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.designer.cs index 8b8fb7dc..f7d32f4f 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.designer.cs @@ -39,7 +39,7 @@ namespace WebsitePanel.Portal { public partial class WebSitesEditSite { - + /// /// asyncTasks control. /// @@ -48,7 +48,7 @@ namespace WebsitePanel.Portal { /// To modify move field declaration from designer file to code-behind file. /// protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks; - + /// /// WDeployBuildPublishingProfileWizardPanel control. /// @@ -57,7 +57,7 @@ namespace WebsitePanel.Portal { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Panel WDeployBuildPublishingProfileWizardPanel; - + /// /// WDeployPubProfilePanel control. /// @@ -418,6 +418,15 @@ namespace WebsitePanel.Portal { /// protected global::System.Web.UI.WebControls.Literal litAppPoolStatus; + /// + /// AppPoolRestartPanel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel AppPoolRestartPanel; + /// /// cmdAppPoolStart control. ///