fixed small bugs
This commit is contained in:
parent
9d5e559604
commit
50245d5522
4 changed files with 9 additions and 3 deletions
|
@ -3375,7 +3375,7 @@ namespace WebsitePanel.EnterpriseServer
|
||||||
int packageCheck = SecurityContext.CheckPackage(org.PackageId, DemandPackage.IsActive);
|
int packageCheck = SecurityContext.CheckPackage(org.PackageId, DemandPackage.IsActive);
|
||||||
if (packageCheck < 0) return packageCheck;
|
if (packageCheck < 0) return packageCheck;
|
||||||
|
|
||||||
string accountName = BuildAccountName(org.OrganizationId, name);
|
string accountName = OrganizationController.BuildAccountNameWithOrgId(org.OrganizationId, name, org.ServiceId);
|
||||||
|
|
||||||
// add account
|
// add account
|
||||||
// add contact
|
// add contact
|
||||||
|
|
|
@ -1534,7 +1534,7 @@ namespace WebsitePanel.EnterpriseServer
|
||||||
/// <param name="name"> The name. </param>
|
/// <param name="name"> The name. </param>
|
||||||
/// <param name="serviceId"> The service identifier. </param>
|
/// <param name="serviceId"> The service identifier. </param>
|
||||||
/// <returns> The account name with organization Id. </returns>
|
/// <returns> The account name with organization Id. </returns>
|
||||||
private static string BuildAccountNameWithOrgId(string orgId, string name, int serviceId)
|
public static string BuildAccountNameWithOrgId(string orgId, string name, int serviceId)
|
||||||
{
|
{
|
||||||
name = ((orgId.Length + name.Length) > 19 && name.Length > 9) ? name.Substring(0, (19 - orgId.Length) < 10 ? 10 : 19 - orgId.Length) : name;
|
name = ((orgId.Length + name.Length) > 19 && name.Length > 9) ? name.Substring(0, (19 - orgId.Length) < 10 ? 10 : 19 - orgId.Length) : name;
|
||||||
|
|
||||||
|
|
|
@ -146,6 +146,8 @@ namespace WebsitePanel.Portal.UserControls
|
||||||
additionalGroups.Add(additionalGroup);
|
additionalGroups.Add(additionalGroup);
|
||||||
|
|
||||||
BindAdditionalGroups(additionalGroups.ToArray());
|
BindAdditionalGroups(additionalGroups.ToArray());
|
||||||
|
|
||||||
|
txtAdditionalGroup.Text = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void btnUpdateAdditionalGroup_Click(object sender, EventArgs e)
|
protected void btnUpdateAdditionalGroup_Click(object sender, EventArgs e)
|
||||||
|
@ -160,6 +162,8 @@ namespace WebsitePanel.Portal.UserControls
|
||||||
.First().GroupName = txtAdditionalGroup.Text;
|
.First().GroupName = txtAdditionalGroup.Text;
|
||||||
|
|
||||||
BindAdditionalGroups(additionalGroups.ToArray());
|
BindAdditionalGroups(additionalGroups.ToArray());
|
||||||
|
|
||||||
|
txtAdditionalGroup.Text = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void gvAdditionalGroup_RowCommand(object sender, GridViewCommandEventArgs e)
|
protected void gvAdditionalGroup_RowCommand(object sender, GridViewCommandEventArgs e)
|
||||||
|
|
|
@ -5217,7 +5217,9 @@
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="ExchangeServer\App_LocalResources\OrganizationSecurityGroupMemberOf.ascx.resx" />
|
<Content Include="ExchangeServer\App_LocalResources\OrganizationSecurityGroupMemberOf.ascx.resx" />
|
||||||
<Content Include="UserControls\App_LocalResources\OrgPolicyEditor.ascx.resx" />
|
<Content Include="UserControls\App_LocalResources\OrgPolicyEditor.ascx.resx">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</Content>
|
||||||
<EmbeddedResource Include="UserControls\App_LocalResources\EditDomainsList.ascx.resx">
|
<EmbeddedResource Include="UserControls\App_LocalResources\EditDomainsList.ascx.resx">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue