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

Merge remote-tracking branch 'origin/dev-v7' into dev-v8

Browse Source 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
	src/Umbraco.Web/umbraco.presentation/library.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
	src/umbraco.MacroEngines/RazorDynamicNode/DynamicBackingItem.cs
	src/umbraco.MacroEngines/app.config
	src/umbraco.MacroEngines/packages.config
	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.editorControls/app.config
	src/umbraco.editorControls/packages.config
	src/umbraco.editorControls/umbraco.editorControls.csproj
	src/umbraco.providers/app.config
This commit is contained in:
Shannon
2015-01-19 13:11:51 +11:00
parent 7a53fa3ba7 db3b8a1acd
commit 02a903f77b
401 changed files with 14875 additions and 5631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,15 +81,9 @@ namespace Umbraco.Web.Install.Controllers
public IEnumerable<Package> GetPackages()
{
var r = new org.umbraco.our.Repository();
var modules = r.Modules();
return modules.Select(package => new Package()
{
Id = package.RepoGuid,
Name = package.Text,
Thumbnail = package.Thumbnail
});
var installHelper = new InstallHelper(UmbracoContext);
var starterKits = installHelper.GetStarterKits();
return starterKits;
}
/// <summary>

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

@@ -57,8 +57,7 @@ namespace Umbraco.Web.Install.Controllers
switch (result)
{
case ValidateRequestAttempt.FailedNoPrivileges:
case ValidateRequestAttempt.FailedTimedOut:
case ValidateRequestAttempt.FailedNoContextId:
case ValidateRequestAttempt.FailedNoContextId:
return Redirect(SystemDirectories.Umbraco + "/AuthorizeUpgrade?redir=" + Server.UrlEncode(Request.RawUrl));
}
}

10
src/Umbraco.Web/Install/Controllers/InstallPackageController.cs
View File

@@ -71,9 +71,9 @@ namespace Umbraco.Web.Install.Controllers
new { success = false, error = "cannot_connect" },
HttpStatusCode.OK);
}
var installer = new global::umbraco.cms.businesslogic.packager.Installer();
var installer = new global::umbraco.cms.businesslogic.packager.Installer(UmbracoContext.Current.Security.CurrentUser.Id);
var tempFile = installer.Import(repo.fetch(model.KitGuid.ToString()));
var tempFile = installer.Import(repo.fetch(model.KitGuid.ToString(), UmbracoContext.Current.Security.CurrentUser.Id));
installer.LoadConfig(tempFile);
var pId = installer.CreateManifest(tempFile, model.KitGuid.ToString(), RepoGuid);
return Json(new
@@ -94,7 +94,7 @@ namespace Umbraco.Web.Install.Controllers
public HttpResponseMessage InstallPackageFiles(InstallPackageModel model)
{
model.PackageFile = HttpUtility.UrlDecode(model.PackageFile);
var installer = new global::umbraco.cms.businesslogic.packager.Installer();
var installer = new global::umbraco.cms.businesslogic.packager.Installer(UmbracoContext.Current.Security.CurrentUser.Id);
installer.LoadConfig(model.PackageFile);
installer.InstallFiles(model.ManifestId, model.PackageFile);
return Json(new
@@ -150,7 +150,7 @@ namespace Umbraco.Web.Install.Controllers
public HttpResponseMessage InstallBusinessLogic(InstallPackageModel model)
{
model.PackageFile = HttpUtility.UrlDecode(model.PackageFile);
var installer = new global::umbraco.cms.businesslogic.packager.Installer();
var installer = new global::umbraco.cms.businesslogic.packager.Installer(UmbracoContext.Current.Security.CurrentUser.Id);
installer.LoadConfig(model.PackageFile);
installer.InstallBusinessLogic(model.ManifestId, model.PackageFile);
return Json(new
@@ -171,7 +171,7 @@ namespace Umbraco.Web.Install.Controllers
public HttpResponseMessage CleanupInstallation(InstallPackageModel model)
{
model.PackageFile = HttpUtility.UrlDecode(model.PackageFile);
var installer = new global::umbraco.cms.businesslogic.packager.Installer();
var installer = new global::umbraco.cms.businesslogic.packager.Installer(UmbracoContext.Current.Security.CurrentUser.Id);
installer.LoadConfig(model.PackageFile);
installer.InstallCleanUp(model.ManifestId, model.PackageFile);