Updates to the installer UI
Adds database and packages step
This commit is contained in:
@@ -93,6 +93,19 @@ namespace Umbraco.Web.Install.Controllers
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public IEnumerable<Package> GetPackages()
|
||||
{
|
||||
var r = new org.umbraco.our.Repository();
|
||||
var modules = r.Modules();
|
||||
|
||||
List<Package> retval = new List<Package>();
|
||||
|
||||
foreach (var package in modules)
|
||||
retval.Add(new Package() { Id = package.RepoGuid, Name = package.Text, Thumbnail = package.Thumbnail });
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Does the install
|
||||
/// </summary>
|
||||
@@ -116,6 +129,7 @@ namespace Umbraco.Web.Install.Controllers
|
||||
//if it is not complete, then we need to execute it
|
||||
if (stepStatus.Value.IsComplete == false)
|
||||
{
|
||||
|
||||
JToken instruction = null;
|
||||
if (step.View.IsNullOrWhiteSpace() == false)
|
||||
{
|
||||
@@ -133,10 +147,11 @@ namespace Umbraco.Web.Install.Controllers
|
||||
|
||||
//update the status
|
||||
InstallStatusTracker.SetComplete(step.Name, setupData);
|
||||
|
||||
return Json(new
|
||||
{
|
||||
complete = false,
|
||||
stepCompleted = step.Name
|
||||
stepCompleted = step.Name
|
||||
}, HttpStatusCode.OK);
|
||||
}
|
||||
catch (InstallException iex)
|
||||
|
||||
Reference in New Issue
Block a user