zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add logic for Accepted Domains to appear under users if exchange is disabled.

Browse source
This commit is contained in:
Virtuworks 2012-11-14 20:37:44 -05:00
parent 31f9268239
commit a13a0cd9ce
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx
View file

@ -127,6 +127,9 @@
<value>Distribution Lists</value> <value>Distribution Lists</value>
</data> </data>
<data name="Text.DomainNames" xml:space="preserve"> <data name="Text.DomainNames" xml:space="preserve">
<value>Domains</value>
</data>
<data name="Text.ExchangeDomainNames" xml:space="preserve">
<value>Accepted Domains</value> <value>Accepted Domains</value>
</data> </data>
<data name="Text.CRMOrganization" xml:space="preserve"> <data name="Text.CRMOrganization" xml:space="preserve">

13
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs
View file

@ -138,10 +138,11 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
exchangeGroup.MenuItems.Add(CreateMenuItem("MailboxPlans", "mailboxplans")); exchangeGroup.MenuItems.Add(CreateMenuItem("MailboxPlans", "mailboxplans"));
if (!hideItems) if (!hideItems)
if (Utils.CheckQouta(Quotas.ORGANIZATION_DOMAINS, cntx)) if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx))
exchangeGroup.MenuItems.Add(CreateMenuItem("DomainNames", "domains")); exchangeGroup.MenuItems.Add(CreateMenuItem("ExchangeDomainNames", "domains"));
if (!hideItems) if (!hideItems)
if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx))
exchangeGroup.MenuItems.Add(CreateMenuItem("StorageUsage", "storage_usage")); exchangeGroup.MenuItems.Add(CreateMenuItem("StorageUsage", "storage_usage"));
if (exchangeGroup.MenuItems.Count > 0) if (exchangeGroup.MenuItems.Count > 0)
@ -164,8 +165,12 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
if (!hideItems) if (!hideItems)
{ {
MenuGroup organizationGroup = new MenuGroup(GetLocalizedString("Text.OrganizationGroup"), imagePath + "company24.png"); MenuGroup organizationGroup = new MenuGroup(GetLocalizedString("Text.OrganizationGroup"), imagePath + "company24.png");
//if (CheckQouta(Quotas.ORGANIZATION_DOMAINS, cntx))
// organizationGroup.MenuItems.Add(CreateMenuItem("DomainNames", "domains")); if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx) == false)
{
if (CheckQouta(Quotas.ORGANIZATION_DOMAINS, cntx))
organizationGroup.MenuItems.Add(CreateMenuItem("DomainNames", "domains"));
}
if (Utils.CheckQouta(Quotas.ORGANIZATION_USERS, cntx)) if (Utils.CheckQouta(Quotas.ORGANIZATION_USERS, cntx))
organizationGroup.MenuItems.Add(CreateMenuItem("Users", "users")); organizationGroup.MenuItems.Add(CreateMenuItem("Users", "users"));