U4-2638 Developer/Packages/Install Starterkit give 500 server error

This commit is contained in:
dampee
2013-08-19 12:51:13 +02:00
parent a099af39c2
commit fb03de37ce
3 changed files with 39 additions and 11 deletions

View File

@@ -87,6 +87,12 @@
<cc1:Pane id="installationCompleted" Text="Installation completed" runat="server" Visible="false">
<p>Installation completed succesfully</p>
</cc1:Pane>
<cc1:Pane id="InstallationDirectoryNotAvailable" Text="Unable to install" runat="server" Visible="false">
<p>We can not install starterkits when the install directory is not present.</p>
</cc1:Pane>
</cc1:UmbracoPanel>

View File

@@ -9,8 +9,10 @@ using Umbraco.Web.UI.Pages;
namespace Umbraco.Web.UI.Umbraco.Developer.Packages
{
using System.IO;
public partial class StarterKits : UmbracoEnsuredPage
{
{
protected void Page_Load(object sender, EventArgs e)
{
@@ -22,6 +24,16 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
private void ShowStarterKits()
{
if (Directory.Exists(this.Server.MapPath(SystemDirectories.Install)) == false)
{
this.InstallationDirectoryNotAvailable.Visible = true;
StarterKitNotInstalled.Visible = false;
StarterKitInstalled.Visible = false;
return;
}
var starterkitsctrl = (LoadStarterKits)LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKits.ascx");
starterkitsctrl.StarterKitInstalled += StarterkitsctrlStarterKitInstalled;
@@ -29,6 +41,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
StarterKitNotInstalled.Visible = true;
StarterKitInstalled.Visible = false;
InstallationDirectoryNotAvailable.Visible = true;
}
@@ -64,5 +77,5 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
installationCompleted.Visible = true;
}
}
}
}

View File

@@ -10,8 +10,8 @@
namespace Umbraco.Web.UI.Umbraco.Developer.Packages {
public partial class StarterKits
{
public partial class StarterKits {
/// <summary>
/// JsInclude1 control.
/// </summary>
@@ -20,7 +20,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
/// <summary>
/// Panel1 control.
/// </summary>
@@ -29,7 +29,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.uicontrols.UmbracoPanel Panel1;
/// <summary>
/// fb control.
/// </summary>
@@ -38,7 +38,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.uicontrols.Feedback fb;
/// <summary>
/// StarterKitInstalled control.
/// </summary>
@@ -47,7 +47,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.uicontrols.Pane StarterKitInstalled;
/// <summary>
/// ph_skins control.
/// </summary>
@@ -56,7 +56,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder ph_skins;
/// <summary>
/// StarterKitNotInstalled control.
/// </summary>
@@ -65,7 +65,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.uicontrols.Pane StarterKitNotInstalled;
/// <summary>
/// ph_starterkits control.
/// </summary>
@@ -74,7 +74,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder ph_starterkits;
/// <summary>
/// installationCompleted control.
/// </summary>
@@ -83,5 +83,14 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.uicontrols.Pane installationCompleted;
/// <summary>
/// InstallationDirectoryNotAvailable control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.uicontrols.Pane InstallationDirectoryNotAvailable;
}
}