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

Merge

Browse source
This commit is contained in:
Alexander Trofimov 2015-01-18 19:00:29 +07:00
commit ce82c938ac
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx
View file

@ -10,7 +10,7 @@
<div class="FormBody"> <div class="FormBody">
<p id="DomainPanel" runat="server" style="padding: 15px 0 15px 5px;"> <p id="DomainPanel" runat="server" style="padding: 15px 0 15px 5px;">
<wsp:DomainControl ID="DomainName" runat="server" RequiredEnabled="True" ValidationGroup="Domain" OnTextChanged="DomainName_TextChanged"></wsp:DomainControl> <wsp:DomainControl ID="DomainName" runat="server" RequiredEnabled="True" ValidationGroup="Domain"></wsp:DomainControl>
</p> </p>
<wsp:CollapsiblePanel id="OptionsPanelHeader" runat="server" <wsp:CollapsiblePanel id="OptionsPanelHeader" runat="server"

8
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.cs
View file

@ -158,8 +158,11 @@ namespace WebsitePanel.Portal
// allow sub-domains // allow sub-domains
AllowSubDomainsPanel.Visible = (type == DomainType.Domain) && PanelSecurity.EffectiveUser.Role != UserRole.User; AllowSubDomainsPanel.Visible = (type == DomainType.Domain) && PanelSecurity.EffectiveUser.Role != UserRole.User;
if (IsPostBack)
{
CheckForCorrectIdnDomainUsage(DomainName.Text); CheckForCorrectIdnDomainUsage(DomainName.Text);
} }
}
private DomainType GetDomainType(string typeName) private DomainType GetDomainType(string typeName)
{ {
@ -279,10 +282,5 @@ namespace WebsitePanel.Portal
return true; return true;
} }
protected void DomainName_TextChanged(object sender, DomainControl.DomainNameEventArgs e)
{
CheckForCorrectIdnDomainUsage(e.DomainName);
}
} }
} }

10
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/DomainControl.ascx.cs
View file

@ -77,11 +77,15 @@ namespace WebsitePanel.Portal.UserControls
get get
{ {
var domainName = txtDomainName.Text.Trim(); var domainName = txtDomainName.Text.Trim();
if (IsSubDomain) if (!IsSubDomain) return domainName;
if (string.IsNullOrEmpty(domainName))
{ {
domainName += "." + DomainsList.SelectedValue; // Only return selected domain from DomainsList when no subdomain is entered yet
return DomainsList.SelectedValue;
} }
return domainName;
return domainName + "." + DomainsList.SelectedValue;
} }
set { txtDomainName.Text = value; } set { txtDomainName.Text = value; }
} }