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 20:41:08 -04:00
commit a8b3d0f123
6 changed files with 19 additions and 7 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)
{ {

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx
View file

@ -30,7 +30,8 @@
<td class="FormLabel150"><asp:Localize ID="locFolder" runat="server" meta:resourcekey="locFolder" Text="Storage Folder:"></asp:Localize></td> <td class="FormLabel150"><asp:Localize ID="locFolder" runat="server" meta:resourcekey="locFolder" Text="Storage Folder:"></asp:Localize></td>
<td> <td>
<div class="Folders" style="display:inline;"> <div class="Folders" style="display:inline;">
<asp:DropDownList ID="ddlFolders" runat="server" CssClass="NormalTextBox" Width="150px" style="vertical-align: middle;" /> <asp:DropDownList ID="ddlFolders" runat="server" CssClass="NormalTextBox" Width="150px" style="vertical-align: middle;" />
<asp:HiddenField id="txtFolderName" runat="server"/>
</div> </div>
<div class="Url" style="display:inline;"> <div class="Url" style="display:inline;">
<asp:Literal ID="lbFolderUrl" runat="server"></asp:Literal> <asp:Literal ID="lbFolderUrl" runat="server"></asp:Literal>
@ -42,6 +43,7 @@
<td> <td>
<div class="LabelAs"> <div class="LabelAs">
<asp:TextBox ID="txtLabelAs" runat="server" CssClass="NormalTextBox" Width="145px"></asp:TextBox> <asp:TextBox ID="txtLabelAs" runat="server" CssClass="NormalTextBox" Width="145px"></asp:TextBox>
</div> </div>
</td> </td>
</tr> </tr>
@ -69,6 +71,7 @@
$('.Folders select').bind('change', function () { $('.Folders select').bind('change', function () {
$('.LabelAs input').val($('.Folders select option:selected').text()); $('.LabelAs input').val($('.Folders select option:selected').text());
$('.Url').text($('.Folders select option:selected').val()); $('.Url').text($('.Folders select option:selected').val());
$('.Folders input').val($('.Folders select option:selected').text());
}); });
}); });
</script> </script>

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.cs
View file

@ -63,6 +63,7 @@ namespace WebsitePanel.Portal.ExchangeServer
{ {
txtLabelAs.Text = ddlFolders.SelectedItem.Text; txtLabelAs.Text = ddlFolders.SelectedItem.Text;
lbFolderUrl.Text = ddlFolders.SelectedItem.Value; lbFolderUrl.Text = ddlFolders.SelectedItem.Value;
txtFolderName.Value = ddlFolders.SelectedItem.Text;
} }
} }
@ -102,7 +103,7 @@ namespace WebsitePanel.Portal.ExchangeServer
PanelRequest.ItemID, PanelRequest.ItemID,
ddlLetters.SelectedItem.Value, ddlLetters.SelectedItem.Value,
txtLabelAs.Text, txtLabelAs.Text,
ddlFolders.SelectedItem.Text); txtFolderName.Value);
if (!result.IsSuccess && result.ErrorCodes.Count > 0) if (!result.IsSuccess && result.ErrorCodes.Count > 0)
{ {

9
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.designer.cs generated
View file

@ -84,6 +84,15 @@ namespace WebsitePanel.Portal.ExchangeServer {
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlFolders; protected global::System.Web.UI.WebControls.DropDownList ddlFolders;
/// <summary>
/// txtFolderName control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField txtFolderName;
/// <summary> /// <summary>
/// lbFolderUrl control. /// lbFolderUrl control.
/// </summary> /// </summary>

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)