From d8f03d36aa8b9c8b623b213edf948913612f20d5 Mon Sep 17 00:00:00 2001 From: dev_amdtel Date: Wed, 23 Apr 2014 10:14:32 +0400 Subject: [PATCH 1/2] fix crm2013 organization menu --- .../OrganizationMenu.ascx.resx | 3 +++ .../WebsitePanel/OrganizationMenu.ascx.cs | 25 ++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx index 07e5cac1..6fcb8114 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx @@ -219,4 +219,7 @@ Organization Home + + CRM 2013 + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs index a624f2e2..45a6fa9f 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs @@ -89,7 +89,9 @@ namespace WebsitePanel.Portal PrepareSharePointMenuRoot(cntx, items, imagePath); //CRM Menu - if (cntx.Groups.ContainsKey(ResourceGroups.HostedCRM)) + if (cntx.Groups.ContainsKey(ResourceGroups.HostedCRM2013)) + PrepareCRM2013MenuRoot(cntx, items, imagePath); + else if (cntx.Groups.ContainsKey(ResourceGroups.HostedCRM)) PrepareCRMMenuRoot(cntx, items, imagePath); //OCS Menu @@ -227,6 +229,27 @@ namespace WebsitePanel.Portal crmItems.Add(CreateMenuItem("StorageLimits", "crm_storage_settings")); } + private void PrepareCRM2013MenuRoot(PackageContext cntx, MenuItemCollection items, string imagePath) + { + MenuItem item = new MenuItem(GetLocalizedString("Text.CRM2013Group"), "", imagePath + "crm_16.png", null); + + item.Selectable = false; + + PrepareCRM2013Menu(cntx, item.ChildItems); + + if (item.ChildItems.Count > 0) + { + items.Add(item); + } + } + + private void PrepareCRM2013Menu(PackageContext cntx, MenuItemCollection crmItems) + { + crmItems.Add(CreateMenuItem("CRMOrganization", "CRMOrganizationDetails")); + crmItems.Add(CreateMenuItem("CRMUsers", "CRMUsers")); + crmItems.Add(CreateMenuItem("StorageLimits", "crm_storage_settings")); + } + private void PrepareBlackBerryMenuRoot(PackageContext cntx, MenuItemCollection items, string imagePath) { MenuItem item = new MenuItem(GetLocalizedString("Text.BlackBerryGroup"), "", imagePath + "blackberry16.png", null); From 969d0bdb115975b43e010074b2b4f5fe8964a0bc Mon Sep 17 00:00:00 2001 From: dev_amdtel Date: Wed, 23 Apr 2014 13:35:54 +0400 Subject: [PATCH 2/2] fix archiving in organization menu --- .../App_LocalResources/OrganizationMenu.ascx.resx | 6 ++++++ .../DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx index 6fcb8114..d80cb8ce 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx @@ -222,4 +222,10 @@ CRM 2013 + + Retention Policy + + + Retention Policy Tag + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs index 45a6fa9f..b01c53fb 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/OrganizationMenu.ascx.cs @@ -194,6 +194,14 @@ namespace WebsitePanel.Portal if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx)) exchangeItems.Add(CreateMenuItem("MailboxPlans", "mailboxplans")); + if (!hideItems) + if (Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWRETENTIONPOLICY, cntx)) + exchangeItems.Add(CreateMenuItem("RetentionPolicy", "retentionpolicy")); + + if (!hideItems) + if (Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWRETENTIONPOLICY, cntx)) + exchangeItems.Add(CreateMenuItem("RetentionPolicyTag", "retentionpolicytag")); + if (!hideItems) if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx)) exchangeItems.Add(CreateMenuItem("ExchangeDomainNames", "domains"));