From 531fd5c6352af38eb4c604957d8f019f2223b504 Mon Sep 17 00:00:00 2001 From: robvde Date: Mon, 3 Sep 2012 18:58:17 +0400 Subject: [PATCH] Fixed: Mailboxplan editing when disabled still allowed to delete mailbox Mailboxplans removed from menu for consumer peer accounts --- .../WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.cs | 2 +- .../WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.cs index 0e72803a..f06a251c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.cs @@ -51,7 +51,7 @@ namespace WebsitePanel.Portal.ExchangeServer { if (cntx.Quotas[Quotas.EXCHANGE2007_ENABLEDPLANSEDITING].QuotaAllocatedValue != 1) { - gvMailboxPlans.Columns[2].Visible = false; + gvMailboxPlans.Columns[3].Visible = false; btnAddMailboxPlan.Enabled = btnAddMailboxPlan.Visible = false; } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs index aceb2231..456a1855 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs @@ -139,8 +139,9 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls if (CheckQouta(Quotas.EXCHANGE2007_ACTIVESYNCALLOWED, cntx)) exchangeGroup.MenuItems.Add(CreateMenuItem("ActiveSyncPolicy", "activesync_policy")); - if (CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx)) - exchangeGroup.MenuItems.Add(CreateMenuItem("MailboxPlans", "mailboxplans")); + if (!hideItems) + if (CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx)) + exchangeGroup.MenuItems.Add(CreateMenuItem("MailboxPlans", "mailboxplans")); if (!hideItems) if (CheckQouta(Quotas.ORGANIZATION_DOMAINS, cntx))