yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asfsafd

Browse Source
This commit is contained in:
Shannon
2014-02-27 10:16:30 +01:00
parent 429b5f7c01
commit 3b71a6c3a5
9 changed files with 102 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
View File

@@ -10,8 +10,17 @@ namespace Umbraco.Web.Install.InstallSteps
[InstallSetupStep("StarterKitCleanup", "")]
internal class StarterKitCleanupStep : InstallSetupStep<object>
{
private readonly InstallStatus _status;
public StarterKitCleanupStep(InstallStatus status)
{
_status = status;
}
public override IDictionary<string, object> Execute(object model)
{
if (_status != InstallStatus.NewInstall) return null;
var installSteps = InstallStatusTracker.GetStatus();
//this step relies on the preious one completed - because it has stored some information we need
if (installSteps.Any(x => x.Key == "StarterKitDownload") == false)

9
src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs
View File

@@ -9,10 +9,19 @@ namespace Umbraco.Web.Install.InstallSteps
[InstallSetupStep("StarterKitDownload", "starterKit")]
internal class StarterKitDownloadStep : InstallSetupStep<Guid>
{
private readonly InstallStatus _status;
public StarterKitDownloadStep(InstallStatus status)
{
_status = status;
}
private const string RepoGuid = "65194810-1f85-11dd-bd0b-0800200c9a66";
public override IDictionary<string, object> Execute(Guid starterKitId)
{
if (_status != InstallStatus.NewInstall) return null;
var result = DownloadPackageFiles(starterKitId);
return new Dictionary<string, object>

6
src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
View File

@@ -10,11 +10,13 @@ namespace Umbraco.Web.Install.InstallSteps
[InstallSetupStep("StarterKitInstall", "")]
internal class StarterKitInstallStep : InstallSetupStep<object>
{
private readonly InstallStatus _status;
private readonly ApplicationContext _applicationContext;
private readonly HttpContextBase _httContext;
public StarterKitInstallStep(ApplicationContext applicationContext, HttpContextBase httContext)
public StarterKitInstallStep(InstallStatus status, ApplicationContext applicationContext, HttpContextBase httContext)
{
_status = status;
_applicationContext = applicationContext;
_httContext = httContext;
}
@@ -22,6 +24,8 @@ namespace Umbraco.Web.Install.InstallSteps
public override IDictionary<string, object> Execute(object model)
{
if (_status != InstallStatus.NewInstall) return null;
var installSteps = InstallStatusTracker.GetStatus();
//this step relies on the preious one completed - because it has stored some information we need
if (installSteps.Any(x => x.Key == "StarterKitDownload") == false)

8
src/Umbraco.Web/Install/InstallSteps/UserStep.cs
View File

@@ -12,10 +12,12 @@ namespace Umbraco.Web.Install.InstallSteps
internal class UserStep : InstallSetupStep<UserModel>
{
private readonly ApplicationContext _applicationContext;
private readonly InstallStatus _status;
public UserStep(ApplicationContext applicationContext)
public UserStep(ApplicationContext applicationContext, InstallStatus status)
{
_applicationContext = applicationContext;
_status = status;
}
private MembershipProvider CurrentProvider
@@ -67,5 +69,9 @@ namespace Umbraco.Web.Install.InstallSteps
return null;
}
public override string View
{
get { return _status == InstallStatus.NewInstall ? base.View : string.Empty; }
}
}
}