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

Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer

Browse Source 
Conflicts:
	src/Umbraco.Web/Install/Controllers/InstallApiController.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseInstallStep.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs
	src/Umbraco.Web/Install/InstallSteps/FilePermissionsStep.cs
	src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
	src/Umbraco.Web/Install/InstallSteps/UserStep.cs
	src/Umbraco.Web/Install/Models/InstallSetupStep.cs
	src/Umbraco.Web/Install/Models/InstallSetupStepAttribute.cs
This commit is contained in:
Shannon
2014-03-04 11:20:52 +11:00
parent 885f691c0e ce65ae8742
commit 000b2b639f
19 changed files with 327 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web/Install/Controllers/InstallApiController.cs
View File

@@ -83,6 +83,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>
@@ -106,6 +119,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.HasUIElement)
{
@@ -129,10 +143,11 @@ namespace Umbraco.Web.Install.Controllers
//update the status
InstallStatusTracker.SetComplete(step.Name, setupData.SavedStepData);
return Json(new
{
complete = false,
stepCompleted = step.Name
stepCompleted = step.Name
}, HttpStatusCode.OK);
}
catch (InstallException iex)

2
src/Umbraco.Web/Install/Controllers/InstallController.cs
View File

@@ -66,7 +66,7 @@ namespace Umbraco.Web.Install.Controllers
ViewBag.InstallApiBaseUrl = Url.GetUmbracoApiService("GetSetup", "InstallApi", "install").TrimEnd("GetSetup");
//get the base umbraco folder
ViewBag.UmbracoBaseFolder = SystemDirectories.Umbraco;
ViewBag.UmbracoBaseFolder = IOHelper.ResolveUrl(SystemDirectories.Umbraco);
return View();
}