Merge
This commit is contained in:
commit
a515c9a68c
116 changed files with 198344 additions and 6475 deletions
|
@ -94,4 +94,20 @@
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="SubHead" width="200" nowrap>Default Currency</td>
|
||||
<td><asp:DropDownList runat="server" ID="ddlCurrency"/></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="SubHead" width="200" nowrap/>Default Collation</td>
|
||||
<td><asp:DropDownList runat="server" ID="ddlCollation" /></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="SubHead" width="200" nowrap>Default Base Language</td>
|
||||
<td><asp:DropDownList runat="server" ID="ddlBaseLanguage" /></td>
|
||||
</tr>
|
||||
|
||||
|
||||
</table>
|
|
@ -27,8 +27,12 @@
|
|||
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
using System;
|
||||
using System.Web.UI.WebControls;
|
||||
using System.Globalization;
|
||||
using WebsitePanel.EnterpriseServer;
|
||||
using WebsitePanel.Providers.Common;
|
||||
using WebsitePanel.Providers.ResultObjects;
|
||||
using WebsitePanel.Providers.HostedSolution;
|
||||
|
||||
namespace WebsitePanel.Portal.ProviderControls
|
||||
{
|
||||
|
@ -60,8 +64,54 @@ namespace WebsitePanel.Portal.ProviderControls
|
|||
int selectedAddressid = FindAddressByText(settings[Constants.CRMWebsiteIP]);
|
||||
ddlCrmIpAddress.AddressId = (selectedAddressid > 0) ? selectedAddressid : 0;
|
||||
|
||||
ddlSchema.SelectedValue = settings[Constants.UrlSchema];
|
||||
|
||||
Utils.SelectListItem(ddlSchema, settings[Constants.UrlSchema]);
|
||||
|
||||
// Collation
|
||||
StringArrayResultObject res = ES.Services.CRM.GetCollationByServiceId(PanelRequest.ServiceId);
|
||||
if (res.IsSuccess)
|
||||
{
|
||||
ddlCollation.DataSource = res.Value;
|
||||
ddlCollation.DataBind();
|
||||
Utils.SelectListItem(ddlCollation, "Latin1_General_CI_AI"); // default
|
||||
}
|
||||
Utils.SelectListItem(ddlCollation, settings[Constants.Collation]);
|
||||
|
||||
// Currency
|
||||
ddlCurrency.Items.Clear();
|
||||
CurrencyArrayResultObject cres = ES.Services.CRM.GetCurrencyByServiceId(PanelRequest.ServiceId);
|
||||
if (cres.IsSuccess)
|
||||
{
|
||||
foreach (Currency currency in cres.Value)
|
||||
{
|
||||
ListItem item = new ListItem(string.Format("{0} ({1})",
|
||||
currency.RegionName, currency.CurrencyName),
|
||||
string.Join("|",
|
||||
new string[]
|
||||
{
|
||||
currency.CurrencyCode, currency.CurrencyName,
|
||||
currency.CurrencySymbol, currency.RegionName
|
||||
}));
|
||||
|
||||
ddlCurrency.Items.Add(item);
|
||||
}
|
||||
Utils.SelectListItem(ddlCurrency, "USD|US Dollar|$|United States"); // default
|
||||
}
|
||||
Utils.SelectListItem(ddlCurrency, settings[Constants.Currency]);
|
||||
|
||||
// Base Language
|
||||
ddlBaseLanguage.Items.Clear();
|
||||
int[] langPacksId = ES.Services.CRM.GetInstalledLanguagePacksByServiceId(PanelRequest.ServiceId);
|
||||
if (langPacksId != null)
|
||||
{
|
||||
foreach (int langId in langPacksId)
|
||||
{
|
||||
CultureInfo ci = CultureInfo.GetCultureInfo(langId);
|
||||
ListItem item = new ListItem(ci.EnglishName, langId.ToString());
|
||||
ddlBaseLanguage.Items.Add(item);
|
||||
}
|
||||
Utils.SelectListItem(ddlBaseLanguage, "1033"); // default
|
||||
}
|
||||
Utils.SelectListItem(ddlBaseLanguage, settings[Constants.BaseLanguage]);
|
||||
}
|
||||
|
||||
public void SaveSettings(System.Collections.Specialized.StringDictionary settings)
|
||||
|
@ -97,6 +147,11 @@ namespace WebsitePanel.Portal.ProviderControls
|
|||
}
|
||||
|
||||
settings[Constants.UrlSchema] = ddlSchema.SelectedValue;
|
||||
|
||||
settings[Constants.Collation] = ddlCollation.SelectedValue;
|
||||
settings[Constants.Currency] = ddlCurrency.SelectedValue;
|
||||
settings[Constants.BaseLanguage] = ddlBaseLanguage.SelectedValue;
|
||||
|
||||
}
|
||||
|
||||
private static int FindAddressByText(string address)
|
||||
|
|
|
@ -35,7 +35,6 @@
|
|||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
|
||||
namespace WebsitePanel.Portal.ProviderControls {
|
||||
|
||||
|
||||
|
@ -166,5 +165,32 @@ namespace WebsitePanel.Portal.ProviderControls {
|
|||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox txtPassword;
|
||||
|
||||
/// <summary>
|
||||
/// ddlCurrency 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.DropDownList ddlCurrency;
|
||||
|
||||
/// <summary>
|
||||
/// ddlCollation 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.DropDownList ddlCollation;
|
||||
|
||||
/// <summary>
|
||||
/// ddlBaseLanguage 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.DropDownList ddlBaseLanguage;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,6 +40,17 @@
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="SubHead" runat="server" id="archivingGroup" width="200" nowrap>
|
||||
<asp:Localize ID="locArchivingDatabase" runat="server" meta:resourcekey="locArchivingDatabase"
|
||||
Text="Archiving Database Name:"></asp:Localize>
|
||||
</td>
|
||||
<td>
|
||||
<asp:TextBox ID="txtArchivingDatabase" runat="server" Width="200px"></asp:TextBox>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr>
|
||||
<td class="SubHead">
|
||||
<asp:Localize ID="locKeepDeletedItems" runat="server" meta:resourcekey="locKeepDeletedItems"
|
||||
|
|
|
@ -93,6 +93,8 @@ namespace WebsitePanel.Portal.ProviderControls
|
|||
locMailboxDAG.Visible = false;
|
||||
|
||||
powershellUrl1.Visible = powershellUrl2.Visible = false;
|
||||
|
||||
archivingGroup.Visible = false;
|
||||
break;
|
||||
|
||||
case EXCHANGE2010SP2_PROVIDER_ID:
|
||||
|
@ -104,6 +106,8 @@ namespace WebsitePanel.Portal.ProviderControls
|
|||
|
||||
locMailboxDatabase.Visible = false;
|
||||
powershellUrl1.Visible = powershellUrl2.Visible = false;
|
||||
|
||||
archivingGroup.Visible = false;
|
||||
break;
|
||||
|
||||
case EXCHANGE2013_PROVIDER_ID:
|
||||
|
@ -115,6 +119,8 @@ namespace WebsitePanel.Portal.ProviderControls
|
|||
|
||||
locMailboxDatabase.Visible = false;
|
||||
powershellUrl1.Visible = powershellUrl2.Visible = true;
|
||||
|
||||
archivingGroup.Visible = true;
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -123,6 +129,8 @@ namespace WebsitePanel.Portal.ProviderControls
|
|||
clusteredMailboxServer.Visible = true;
|
||||
txtMailboxClusterName.Text = settings["MailboxCluster"];
|
||||
locMailboxDAG.Visible = false;
|
||||
|
||||
archivingGroup.Visible = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -153,6 +161,8 @@ namespace WebsitePanel.Portal.ProviderControls
|
|||
txtPublicFolderServer.Text = settings["PublicFolderServer"];
|
||||
txtPowerShellUrl.Text = settings["PowerShellUrl"];
|
||||
|
||||
txtArchivingDatabase.Text = settings["ArchivingDatabase"];
|
||||
|
||||
UpdateHubTransportsGrid();
|
||||
UpdateClientAccessGrid();
|
||||
|
||||
|
@ -179,6 +189,9 @@ namespace WebsitePanel.Portal.ProviderControls
|
|||
|
||||
settings["StorageGroup"] = txtStorageGroup.Text;
|
||||
settings["PowerShellUrl"] = txtPowerShellUrl.Text;
|
||||
|
||||
settings["ArchivingDatabase"] = txtArchivingDatabase.Text;
|
||||
|
||||
}
|
||||
|
||||
public void BindExchangeServices(DropDownList ddl, bool isHubservice)
|
||||
|
|
|
@ -139,6 +139,33 @@ namespace WebsitePanel.Portal.ProviderControls {
|
|||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox txtMailboxDatabase;
|
||||
|
||||
/// <summary>
|
||||
/// archivingGroup control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlTableCell archivingGroup;
|
||||
|
||||
/// <summary>
|
||||
/// locArchivingDatabase 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.Localize locArchivingDatabase;
|
||||
|
||||
/// <summary>
|
||||
/// txtArchivingDatabase 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.TextBox txtArchivingDatabase;
|
||||
|
||||
/// <summary>
|
||||
/// locKeepDeletedItems control.
|
||||
/// </summary>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue