From 5f412a78d38ea345cb57de81d806c1df6605835c Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Mon, 16 Jun 2014 00:41:16 +0300 Subject: [PATCH 1/4] fixed bug when creating mapped drive --- .../ExchangeServer/EnterpriseStorageCreateDriveMap.ascx | 5 ++++- .../EnterpriseStorageCreateDriveMap.ascx.cs | 3 ++- .../EnterpriseStorageCreateDriveMap.ascx.designer.cs | 9 +++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx index 782c6530..17129e7f 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx @@ -30,7 +30,8 @@
- + +
@@ -42,6 +43,7 @@
+
@@ -69,6 +71,7 @@ $('.Folders select').bind('change', function () { $('.LabelAs input').val($('.Folders select option:selected').text()); $('.Url').text($('.Folders select option:selected').val()); + $('.Folders input').val($('.Folders select option:selected').text()); }); }); \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.cs index 8a9b9b5e..250137a7 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.cs @@ -63,6 +63,7 @@ namespace WebsitePanel.Portal.ExchangeServer { txtLabelAs.Text = ddlFolders.SelectedItem.Text; lbFolderUrl.Text = ddlFolders.SelectedItem.Value; + txtFolderName.Value = ddlFolders.SelectedItem.Text; } } @@ -102,7 +103,7 @@ namespace WebsitePanel.Portal.ExchangeServer PanelRequest.ItemID, ddlLetters.SelectedItem.Value, txtLabelAs.Text, - ddlFolders.SelectedItem.Text); + txtFolderName.Value); if (!result.IsSuccess && result.ErrorCodes.Count > 0) { diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.designer.cs index e1b30731..9ce14f62 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx.designer.cs @@ -84,6 +84,15 @@ namespace WebsitePanel.Portal.ExchangeServer { /// protected global::System.Web.UI.WebControls.DropDownList ddlFolders; + /// + /// txtFolderName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField txtFolderName; + /// /// lbFolderUrl control. /// From 14f0a11f38a32e6c96232da5bcc012a1cae0054f Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 16 Jun 2014 13:21:43 -0400 Subject: [PATCH 2/4] Added tag build-2.1.0.355 for changeset 56de9ea0b93a From a6d6bb374ba30732a292c632edeeb49dd54401a0 Mon Sep 17 00:00:00 2001 From: dev_amdtel Date: Tue, 17 Jun 2014 00:04:51 +0400 Subject: [PATCH 3/4] Fix archiving --- .../Exchange2013.cs | 1 + .../ExchangeServer/ExchangeMailboxGeneralSettings.ascx | 4 ++-- .../ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs index b75993f8..668888ea 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs @@ -7317,6 +7317,7 @@ namespace WebsitePanel.Providers.HostedSolution cmd.Parameters.Add("Identity", accountName); cmd.Parameters.Add("Archive"); string database = GetDatabase(runSpace, PrimaryDomainController, ArchiveMailboxDatabase); + if (String.IsNullOrEmpty(database)) database = ArchiveMailboxDatabase; ExchangeLog.DebugInfo("archivedatabase: " + database); if (database != string.Empty) { diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx index d3764b2f..40324a81 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx @@ -49,7 +49,7 @@ - + @@ -108,7 +108,7 @@ - +
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs index c59e5e69..b1c6aa4c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs @@ -82,7 +82,6 @@ namespace WebsitePanel.Portal.ExchangeServer } secRetentionPolicy.Visible = Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWRETENTIONPOLICY, Cntx); - } int planId = -1; @@ -90,8 +89,6 @@ namespace WebsitePanel.Portal.ExchangeServer ExchangeMailboxPlan plan = ES.Services.ExchangeServer.GetExchangeMailboxPlan(PanelRequest.ItemID, planId); secArchiving.Visible = plan.EnableArchiving; - - rowArchiving.Visible = chkEnableArchiving.Checked; } private void BindSettings() @@ -165,6 +162,7 @@ namespace WebsitePanel.Portal.ExchangeServer chkEnableArchiving.Checked = account.EnableArchiving; archivingQuotaViewer.QuotaUsedValue = Convert.ToInt32(stats.ArchivingTotalSize / 1024 / 1024); archivingQuotaViewer.QuotaValue = ArchivingMaxSize; + rowArchiving.Visible = chkEnableArchiving.Checked; } catch (Exception ex) From b188c65ba62c4a6dac34af544dda95952fc3aaa0 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 16 Jun 2014 16:18:30 -0400 Subject: [PATCH 4/4] Added tag build-2.1.0.356 for changeset 3d287dd36278