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

Fix for "Object reference error" with WebSitesHeliconApe

Browse source
This commit is contained in:
Virtuworks 2013-01-23 16:12:13 -05:00
parent 73cd732e6d
commit 50d22d2dee
1 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

37
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx.cs
View file

@ -53,7 +53,20 @@ namespace WebsitePanel.Portal
private HeliconApeStatus HeliconApeStatus private HeliconApeStatus HeliconApeStatus
{ {
get { return (HeliconApeStatus)ViewState["HeliconApeStatus"]; } get
{
if (null == ViewState["HeliconApeStatus"])
{
HeliconApeStatus nullstatus = new HeliconApeStatus();
return nullstatus;
}
else
{
return (HeliconApeStatus)ViewState["HeliconApeStatus"];
}
}
set { ViewState["HeliconApeStatus"] = value; } set { ViewState["HeliconApeStatus"] = value; }
} }
@ -91,17 +104,23 @@ namespace WebsitePanel.Portal
// Render a warning message about the automatic site's settings change // Render a warning message about the automatic site's settings change
if (!HeliconApeStatus.IsEnabled && site.IIs7) if (site.IIs7)
{ {
// Ensure the message is displayed only when neccessary if (!HeliconApeStatus.IsEnabled)
if (site.EnableWindowsAuthentication || !site.AspNetInstalled.EndsWith("I") || site.SecuredFoldersInstalled)
{ {
// TODO: show warning, do not force to enable integrated pool // Ensure the message is displayed only when neccessary
string warningStr = GetLocalizedString("EnableFoldersIIs7Warning.Text"); if (site.EnableWindowsAuthentication || !site.AspNetInstalled.EndsWith("I") || site.SecuredFoldersInstalled)
// Render a warning only if specified {
if (!String.IsNullOrEmpty(warningStr)) // TODO: show warning, do not force to enable integrated pool
btnToggleHeliconApe.OnClientClick = String.Format("return confirm('{0}')", warningStr); string warningStr = GetLocalizedString("EnableFoldersIIs7Warning.Text");
// Render a warning only if specified
if (!String.IsNullOrEmpty(warningStr))
btnToggleHeliconApe.OnClientClick = String.Format("return confirm('{0}')", warningStr);
}
} }
} }
// toggle // toggle
ToggleControls(); ToggleControls();