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

a new page with the list of associated objects to be deleted org domain. part 3

Browse source
This commit is contained in:
dev_amdtel 2014-12-25 02:31:56 +04:00
parent a80c7be8c5
commit 72bbf208e1
4 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ESModule_ControlsHierarchy.config
View file

@ -64,6 +64,7 @@
<Control key="domains" />
<Control key="add_domain" general_key="domains" />
<Control key="domain_records" general_key="domains" />
<Control key="check_domain" />
<Control key="storage_usage" />
<Control key="storage_usage_details" general_key="storage_usage" />

7
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeCheckDomainName.ascx.resx
View file

@ -118,10 +118,10 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="locTitle.Text" xml:space="preserve">
<value>Delete domain</value>
<value>Domain Dependencies</value>
</data>
<data name="Text.PageName" xml:space="preserve">
<value>Delete domain</value>
<value>Domain Dependencies</value>
</data>
<data name="gvObjectsDisplayName.Header" xml:space="preserve">
<value>Display Name</value>
@ -177,4 +177,7 @@
<data name="User.Text" xml:space="preserve">
<value>Organization user</value>
</data>
<data name="LyncUsers.Text" xml:space="preserve">
<value>Lync User</value>
</data>
</root>

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

@ -44,7 +44,8 @@ namespace WebsitePanel.Portal.ExchangeServer
if (!IsPostBack)
{
// save return URL
ViewState["ReturnUrl"] = Request.UrlReferrer.ToString();
if (Request.UrlReferrer!=null)
ViewState["ReturnUrl"] = Request.UrlReferrer.ToString();
// domain name
DomainInfo domain = ES.Services.Servers.GetDomain(PanelRequest.DomainID);