Exchange Shared and Resource mailboxes : AccountType fix
This commit is contained in:
parent
f54b1b8466
commit
b4ce9904b4
13 changed files with 43 additions and 32 deletions
|
@ -186,9 +186,6 @@
|
|||
<data name="valRequireSubscriberNumber.Text" xml:space="preserve">
|
||||
<value>*</value>
|
||||
</data>
|
||||
<data name="ResourceMailbox.Text" xml:space="preserve">
|
||||
<value>Resource Mailbox</value>
|
||||
</data>
|
||||
<data name="SharedMailbox.Text" xml:space="preserve">
|
||||
<value>Shared Mailbox</value>
|
||||
</data>
|
||||
|
|
|
@ -91,29 +91,36 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
if (plans.Length == 0)
|
||||
btnCreate.Enabled = false;
|
||||
|
||||
bool allowResourceMailbox = false;
|
||||
|
||||
if (cntx.Quotas.ContainsKey(Quotas.EXCHANGE2007_ISCONSUMER))
|
||||
{
|
||||
if (cntx.Quotas[Quotas.EXCHANGE2007_ISCONSUMER].QuotaAllocatedValue != 1)
|
||||
{
|
||||
locSubscriberNumber.Visible = txtSubscriberNumber.Visible = valRequireSubscriberNumber.Enabled = false;
|
||||
rbMailboxType.Items.Add(new System.Web.UI.WebControls.ListItem(GetLocalizedString("RoomMailbox.Text"), "5"));
|
||||
rbMailboxType.Items.Add(new System.Web.UI.WebControls.ListItem(GetLocalizedString("EquipmentMailbox.Text"), "6"));
|
||||
allowResourceMailbox = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (cntx.Quotas.ContainsKey(Quotas.EXCHANGE2013_RESOURCEMAILBOXES))
|
||||
{
|
||||
if (cntx.Quotas[Quotas.EXCHANGE2013_RESOURCEMAILBOXES].QuotaAllocatedValue != 0)
|
||||
allowResourceMailbox = true;
|
||||
}
|
||||
|
||||
|
||||
if (allowResourceMailbox)
|
||||
{
|
||||
rbMailboxType.Items.Add(new System.Web.UI.WebControls.ListItem(GetLocalizedString("RoomMailbox.Text"), "5"));
|
||||
rbMailboxType.Items.Add(new System.Web.UI.WebControls.ListItem(GetLocalizedString("EquipmentMailbox.Text"), "6"));
|
||||
}
|
||||
|
||||
if (cntx.Quotas.ContainsKey(Quotas.EXCHANGE2013_SHAREDMAILBOXES))
|
||||
{
|
||||
if (cntx.Quotas[Quotas.EXCHANGE2013_SHAREDMAILBOXES].QuotaAllocatedValue != 0)
|
||||
rbMailboxType.Items.Add(new System.Web.UI.WebControls.ListItem(GetLocalizedString("SharedMailbox.Text"), "10"));
|
||||
|
||||
}
|
||||
|
||||
if (cntx.Quotas.ContainsKey(Quotas.EXCHANGE2013_RESOURCEMAILBOXES))
|
||||
{
|
||||
if (cntx.Quotas[Quotas.EXCHANGE2013_RESOURCEMAILBOXES].QuotaAllocatedValue != 0)
|
||||
rbMailboxType.Items.Add(new System.Web.UI.WebControls.ListItem(GetLocalizedString("ResourceMailbox.Text"), "11"));
|
||||
|
||||
}
|
||||
|
||||
rowRetentionPolicy.Visible = Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWRETENTIONPOLICY, cntx);
|
||||
}
|
||||
|
|
|
@ -186,8 +186,11 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
if (account.AccountType == ExchangeAccountType.SharedMailbox)
|
||||
litDisplayName.Text += GetSharedLocalizedString("SharedMailbox.Text");
|
||||
|
||||
if (account.AccountType == ExchangeAccountType.ResourceMailbox)
|
||||
litDisplayName.Text += GetSharedLocalizedString("ResourceMailbox.Text");
|
||||
if (account.AccountType == ExchangeAccountType.Room)
|
||||
litDisplayName.Text += GetSharedLocalizedString("RoomMailbox.Text");
|
||||
|
||||
if (account.AccountType == ExchangeAccountType.Equipment)
|
||||
litDisplayName.Text += GetSharedLocalizedString("EquipmentMailbox.Text");
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
|
|
@ -74,8 +74,11 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
if (account.AccountType == ExchangeAccountType.SharedMailbox)
|
||||
litDisplayName.Text += GetSharedLocalizedString("SharedMailbox.Text");
|
||||
|
||||
if (account.AccountType == ExchangeAccountType.ResourceMailbox)
|
||||
litDisplayName.Text += GetSharedLocalizedString("ResourceMailbox.Text");
|
||||
if (account.AccountType == ExchangeAccountType.Room)
|
||||
litDisplayName.Text += GetSharedLocalizedString("RoomMailbox.Text");
|
||||
|
||||
if (account.AccountType == ExchangeAccountType.Equipment)
|
||||
litDisplayName.Text += GetSharedLocalizedString("EquipmentMailbox.Text");
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
|
|
@ -108,7 +108,7 @@
|
|||
OnSelected="odsAccountsPaged_Selected">
|
||||
<SelectParameters>
|
||||
<asp:QueryStringParameter Name="itemId" QueryStringField="ItemID" DefaultValue="0" />
|
||||
<asp:Parameter Name="accountTypes" DefaultValue="1,5,6,10,11" />
|
||||
<asp:Parameter Name="accountTypes" DefaultValue="1,5,6,10" />
|
||||
<asp:ControlParameter Name="filterColumn" ControlID="ddlSearchColumn" PropertyName="SelectedValue" />
|
||||
<asp:ControlParameter Name="filterValue" ControlID="txtSearchValue" PropertyName="Text" />
|
||||
<asp:Parameter Name="archiving" Type="Boolean" />
|
||||
|
|
|
@ -151,6 +151,7 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
{
|
||||
ExchangeAccountType accountType = (ExchangeAccountType)accountTypeId;
|
||||
string imgName = "mailbox_16.gif";
|
||||
|
||||
if (accountType == ExchangeAccountType.Contact)
|
||||
imgName = "contact_16.gif";
|
||||
else if (accountType == ExchangeAccountType.DistributionList)
|
||||
|
@ -159,6 +160,8 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
imgName = "room_16.gif";
|
||||
else if (accountType == ExchangeAccountType.Equipment)
|
||||
imgName = "equipment_16.gif";
|
||||
else if (accountType == ExchangeAccountType.SharedMailbox)
|
||||
imgName = "shared_16.gif";
|
||||
|
||||
if (vip && cntx.Groups.ContainsKey(ResourceGroups.ServiceLevels)) imgName = "vip_user_16.png";
|
||||
|
||||
|
@ -259,13 +262,13 @@ namespace WebsitePanel.Portal.ExchangeServer
|
|||
chkMailboxes.Checked = true;
|
||||
|
||||
if (chkMailboxes.Checked)
|
||||
accountTypes.AddRange(new string[] {"1","5","6"});
|
||||
accountTypes.Add("1");
|
||||
|
||||
if (chkSharedMailboxes.Checked)
|
||||
accountTypes.Add("10");
|
||||
|
||||
if (chkResourceMailboxes.Checked)
|
||||
accountTypes.Add("11");
|
||||
accountTypes.AddRange(new string[] {"5","6"});
|
||||
|
||||
odsAccountsPaged.SelectParameters["accountTypes"].DefaultValue = string.Join(",", accountTypes);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue