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

Merge

Browse source
This commit is contained in:
Virtuworks 2014-06-16 16:10:38 -04:00
commit ab64d307cd
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
View file

@ -7317,6 +7317,7 @@ namespace WebsitePanel.Providers.HostedSolution
cmd.Parameters.Add("Identity", accountName); cmd.Parameters.Add("Identity", accountName);
cmd.Parameters.Add("Archive"); cmd.Parameters.Add("Archive");
string database = GetDatabase(runSpace, PrimaryDomainController, ArchiveMailboxDatabase); string database = GetDatabase(runSpace, PrimaryDomainController, ArchiveMailboxDatabase);
if (String.IsNullOrEmpty(database)) database = ArchiveMailboxDatabase;
ExchangeLog.DebugInfo("archivedatabase: " + database); ExchangeLog.DebugInfo("archivedatabase: " + database);
if (database != string.Empty) if (database != string.Empty)
{ {

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx
View file

@ -49,7 +49,7 @@
<tr> <tr>
<td class="FormLabel150"><asp:Localize ID="Localize2" runat="server" meta:resourcekey="locMailboxplanName" Text="Mailbox plan: *"></asp:Localize></td> <td class="FormLabel150"><asp:Localize ID="Localize2" runat="server" meta:resourcekey="locMailboxplanName" Text="Mailbox plan: *"></asp:Localize></td>
<td> <td>
<wsp:MailboxPlanSelector ID="mailboxPlanSelector" runat="server" Changed="mailboxPlanSelector_Changed" /> <wsp:MailboxPlanSelector ID="mailboxPlanSelector" runat="server" OnChanged="mailboxPlanSelector_Changed" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -108,7 +108,7 @@
<tr> <tr>
<td class="FormLabel150"></td> <td class="FormLabel150"></td>
<td> <td>
<asp:CheckBox ID="chkEnableArchiving" runat="server" meta:resourcekey="chkEnableArchiving" Text="Enable archiving" AutoPostBack="true" /> <asp:CheckBox ID="chkEnableArchiving" runat="server" meta:resourcekey="chkEnableArchiving" Text="Enable archiving" />
<br /> <br />
</td> </td>
</tr> </tr>

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs
View file

@ -82,7 +82,6 @@ namespace WebsitePanel.Portal.ExchangeServer
} }
secRetentionPolicy.Visible = Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWRETENTIONPOLICY, Cntx); secRetentionPolicy.Visible = Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWRETENTIONPOLICY, Cntx);
} }
int planId = -1; int planId = -1;
@ -90,8 +89,6 @@ namespace WebsitePanel.Portal.ExchangeServer
ExchangeMailboxPlan plan = ES.Services.ExchangeServer.GetExchangeMailboxPlan(PanelRequest.ItemID, planId); ExchangeMailboxPlan plan = ES.Services.ExchangeServer.GetExchangeMailboxPlan(PanelRequest.ItemID, planId);
secArchiving.Visible = plan.EnableArchiving; secArchiving.Visible = plan.EnableArchiving;
rowArchiving.Visible = chkEnableArchiving.Checked;
} }
private void BindSettings() private void BindSettings()
@ -165,6 +162,7 @@ namespace WebsitePanel.Portal.ExchangeServer
chkEnableArchiving.Checked = account.EnableArchiving; chkEnableArchiving.Checked = account.EnableArchiving;
archivingQuotaViewer.QuotaUsedValue = Convert.ToInt32(stats.ArchivingTotalSize / 1024 / 1024); archivingQuotaViewer.QuotaUsedValue = Convert.ToInt32(stats.ArchivingTotalSize / 1024 / 1024);
archivingQuotaViewer.QuotaValue = ArchivingMaxSize; archivingQuotaViewer.QuotaValue = ArchivingMaxSize;
rowArchiving.Visible = chkEnableArchiving.Checked;
} }
catch (Exception ex) catch (Exception ex)