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

Fixed: Hide integrated ou provisioning when no hosted organizations are enabled

Browse source 
within hosting plan
This commit is contained in:
robvde 2012-11-13 08:33:00 +04:00
parent 20ea2117d0
commit e09496e4d3
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
View file

@ -9,7 +9,7 @@
<add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" /> <add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
<add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" /> <add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
--> -->
<add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" /> <add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
<!-- A1D4KDHUE83NKHddF --> <!-- A1D4KDHUE83NKHddF -->
@ -17,7 +17,7 @@
<add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" /> <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
<add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" /> <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
--> -->
<add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" /> <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
<!-- A1D4KDHUE83NKHddF --> <!-- A1D4KDHUE83NKHddF -->
<add key="WebsitePanel.EncryptionEnabled" value="true" /> <add key="WebsitePanel.EncryptionEnabled" value="true" />
<!-- Web Applications --> <!-- Web Applications -->

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

@ -99,7 +99,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="SubHead"> <td class="Normal" width="100%">
<asp:Label ID="lblHostName" runat="server" meta:resourcekey="lblHostName" Text="Host name:"></asp:Label> <asp:Label ID="lblHostName" runat="server" meta:resourcekey="lblHostName" Text="Host name:"></asp:Label>
<asp:TextBox ID="txtHostName" runat="server" CssClass="TextBox100" MaxLength="64" ></asp:TextBox> <asp:TextBox ID="txtHostName" runat="server" CssClass="TextBox100" MaxLength="64" ></asp:TextBox>
</td> </td>

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserCreateSpace.ascx.cs
View file

@ -86,6 +86,7 @@ namespace WebsitePanel.Portal
bool webEnabled = false; bool webEnabled = false;
bool ftpEnabled = false; bool ftpEnabled = false;
bool mailEnabled = false; bool mailEnabled = false;
bool integratedOUEnabled = false;
// load hosting context // load hosting context
if (planId > 0) if (planId > 0)
@ -111,6 +112,7 @@ namespace WebsitePanel.Portal
ftpEnabled = cntx.Groups.ContainsKey(ResourceGroups.Ftp); ftpEnabled = cntx.Groups.ContainsKey(ResourceGroups.Ftp);
mailEnabled = cntx.Groups.ContainsKey(ResourceGroups.Mail); mailEnabled = cntx.Groups.ContainsKey(ResourceGroups.Mail);
integratedOUEnabled = cntx.Groups.ContainsKey(ResourceGroups.HostedOrganizations);
} }
} }
@ -129,7 +131,7 @@ namespace WebsitePanel.Portal
ftpAccountName.Visible = (rbFtpAccountName.SelectedIndex == 1); ftpAccountName.Visible = (rbFtpAccountName.SelectedIndex == 1);
chkIntegratedOUProvisioning.Visible = chkCreateResources.Visible; chkIntegratedOUProvisioning.Checked = chkIntegratedOUProvisioning.Visible = (chkCreateResources.Visible && integratedOUEnabled);
} }
private void CreateHostingSpace() private void CreateHostingSpace()