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

AjaxControlToolkit updated to the latest version. Fixed some warning in Portal compilation.

Browse source
This commit is contained in:
feodor_fitsner 2012-01-16 09:47:13 -08:00
parent 84f0cc724c
commit a936174491
5 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
WebsitePanel/Lib/AjaxControlToolkit.dll
View file

Binary file not shown.

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/HyperVForPrivateCloud_Settings.ascx.cs
View file

@ -68,7 +68,7 @@ namespace WebsitePanel.Portal.ProviderControls
hosts = ES.Services.VPSPC.GetClusters(PanelRequest.ServiceId); hosts = ES.Services.VPSPC.GetClusters(PanelRequest.ServiceId);
} }
} }
catch (Exception ex) catch
{ {
hosts = null; hosts = null;
} }

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPSForPC/VdcCreateServer.ascx.cs
View file

@ -130,7 +130,7 @@ namespace WebsitePanel.Portal.VPSForPC
btn.Enabled = false; btn.Enabled = false;
} }
messageBox.ShowErrorMessage("VPS_ERROR_CREATE", new Exception("no templates")); messageBox.ShowErrorMessage("VPS_ERROR_CREATE", new Exception("no templates", ex));
} }
// summary letter e-mail // summary letter e-mail
PackageInfo package = ES.Services.Packages.GetPackage(PanelSecurity.PackageId); PackageInfo package = ES.Services.Packages.GetPackage(PanelSecurity.PackageId);

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPSForPC/VdcFastCreateServer.ascx.cs
View file

@ -85,7 +85,7 @@ namespace WebsitePanel.Portal.VPSForPC
listOperatingSystems.Enabled = false; listOperatingSystems.Enabled = false;
txtVmName.Enabled = false; txtVmName.Enabled = false;
btnCreate.Enabled = false; btnCreate.Enabled = false;
messageBox.ShowErrorMessage("VPS_ERROR_CREATE", new Exception("no VM")); messageBox.ShowErrorMessage("VPS_ERROR_CREATE", new Exception("no VM", ex));
} }
} }

7
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPSForPC/VpsDetailsConfiguration.ascx.cs
View file

@ -67,12 +67,7 @@ namespace WebsitePanel.Portal.VPSForPC
} }
catch (Exception ex) catch (Exception ex)
{ {
vm = null; messageBox.ShowErrorMessage("VPS_LOAD_VM_META_ITEM", ex);
}
if (vm == null)
{
messageBox.ShowErrorMessage("VPS_LOAD_VM_META_ITEM");
return; return;
} }