From ec13a31c5cd7e03c31c1f95fd3de3f06aa20f968 Mon Sep 17 00:00:00 2001 From: me Date: Wed, 18 Feb 2015 16:16:24 +0400 Subject: [PATCH] fix Actions List --- .../UserControls/SpaceServiceItems.ascx.cs | 14 ++++++++------ .../DesktopModules/WebsitePanel/WebSites.ascx | 3 +-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SpaceServiceItems.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SpaceServiceItems.ascx.cs index a95ef8a9..36b6e71f 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SpaceServiceItems.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SpaceServiceItems.ascx.cs @@ -91,12 +91,6 @@ namespace WebsitePanel.Portal.UserControls set { EnsureChildControls(); QuotasPanel.Visible = value; } } - public bool ShowActions - { - get { EnsureChildControls(); return QuotasPanel.Visible; } - set { EnsureChildControls(); websiteActions.Visible = value; } - } - protected void Page_Load(object sender, EventArgs e) { //HideServiceColumns(gvWebSites); @@ -119,6 +113,14 @@ namespace WebsitePanel.Portal.UserControls (PanelSecurity.SelectedUser.Role != UserRole.User) && chkRecursive.Checked; gvItems.Columns[5].Visible = (PanelSecurity.SelectedUser.Role == UserRole.Administrator); gvItems.Columns[6].Visible = (PanelSecurity.EffectiveUser.Role == UserRole.Administrator); + if (QuotaName == "Web.Sites") + { + websiteActions.Visible = true; + } + else + { + websiteActions.Visible = false; + } if (!IsPostBack) { diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSites.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSites.ascx index 2da7d722..517cd7cc 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSites.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSites.ascx @@ -9,5 +9,4 @@ CreateControlID="add_site" GroupName="Web" TypeName="WebsitePanel.Providers.Web.WebSite, WebsitePanel.Providers.Base" - QuotaName="Web.Sites" - ShowActions = "True" /> \ No newline at end of file + QuotaName="Web.Sites" /> \ No newline at end of file