Read me
- {{ vm.localPackage.readme }} +
- - {{ vm.localPackage.readme }} +
+
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js
index 279ebd3bb2..e2b5fb4de8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js
@@ -18,6 +18,8 @@
.then(function (packs) {
vm.installedPackages = packs;
});
+ vm.installState.status = "";
+ vm.state = "list";
}
function confirmUninstall(pck) {
@@ -28,9 +30,16 @@
function uninstallPackage(installedPackage) {
vm.installState.status = "Uninstalling package...";
packageResource.uninstall(installedPackage.id)
- .then(function() {
- var url = window.location.href + "?uninstalled=" + vm.package.packageGuid;
- window.location.reload(true);
+ .then(function () {
+ if (installedPackage.files.length > 0) {
+ vm.installState.status = "All done, your browser will now refresh";
+
+ var url = window.location.href + "?uninstalled=" + vm.package.packageGuid;
+ window.location.reload(true);
+ }
+ else {
+ init();
+ }
});
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
index d4c810d641..403406545c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.html
@@ -83,11 +83,11 @@
Uninstall package
-
+ This package cannot be installed, it requires a minimum Umbraco version of {{vm.localPackage.umbracoVersion}}
+
+ {{vm.installState.status}}
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
index f632d69e62..e87a4a2426 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
@@ -1,26 +1,30 @@
(function () {
"use strict";
- function PackagesRepoController($scope, $route, $location, $timeout, ourPackageRepositoryResource, $q) {
+ function PackagesRepoController($scope, $route, $location, $timeout, ourPackageRepositoryResource, $q, packageResource, $cookieStore) {
var vm = this;
vm.packageViewState = "packageList";
vm.categories = [];
- vm.loading = false;
+ vm.loading = true;
vm.pagination = {
pageNumber: 1,
totalPages: 10,
- pageSize: 2
+ pageSize: 8
};
vm.searchQuery = "";
-
+ vm.installState = {
+ status: ""
+ };
vm.selectCategory = selectCategory;
vm.showPackageDetails = showPackageDetails;
vm.setPackageViewState = setPackageViewState;
vm.nextPage = nextPage;
vm.prevPage = prevPage;
vm.goToPage = goToPage;
+ vm.installPackage = installPackage;
+ vm.downloadPackage = downloadPackage;
//used to cancel any request in progress if another one needs to take it's place
var canceler = null;
@@ -91,10 +95,7 @@
canceler = null;
});
}
- }
- else {
- vm.loading = false;
- }
+ }
});
}, 200));
@@ -175,6 +176,61 @@
});
}
+ function downloadPackage(selectedPackage) {
+ vm.loading = true;
+
+ packageResource
+ .fetch(selectedPackage.id)
+ .then(function(pack) {
+ vm.packageViewState = "packageInstall";
+ vm.loading = false;
+ vm.localPackage = pack;
+ vm.localPackage.allowed = true;
+ },
+ error);
+ }
+
+ function error(e, args) {
+
+ }
+
+ function installPackage(selectedPackage) {
+
+ vm.installState.status = "importing...";
+
+ packageResource
+ .import(selectedPackage)
+ .then(function(pack) {
+ vm.installState.status = "Installing...";
+ return packageResource.installFiles(pack);
+ },
+ error)
+ .then(function(pack) {
+ vm.installState.status = "Restarting, please wait...";
+ return packageResource.installData(pack);
+ },
+ error)
+ .then(function(pack) {
+ vm.installState.status = "All done, your browser will now refresh";
+ return packageResource.cleanUp(pack);
+ },
+ error)
+ .then(function(result) {
+
+ if (result.postInstallationPath) {
+ //Put the redirect Uri in a cookie so we can use after reloading
+ window.localStorage.setItem("packageInstallUri", result.postInstallationPath);
+ }
+
+ //reload on next digest (after cookie)
+ $timeout(function () {
+ window.location.reload(true);
+ });
+
+ },
+ error);
+ }
+
init();
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
index 7a0abd6dc5..d42e955b4f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
+++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
@@ -7,7 +7,7 @@
@@ -131,13 +131,13 @@
+
+
+
+
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index b8ffbe3572..41f183eb8c 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -218,10 +218,52 @@ namespace Umbraco.Web.Editors
Version = pack.Version,
Url = pack.Url,
License = pack.License,
- LicenseUrl = pack.LicenseUrl
+ LicenseUrl = pack.LicenseUrl,
+ Files = pack.Files
}).ToList();
}
+ private void PopulateFromPackageData(LocalPackageInstallModel model)
+ {
+ var ins = new global::umbraco.cms.businesslogic.packager.Installer(Security.CurrentUser.Id);
+ //this will load in all the metadata too
+ var tempDir = ins.Import(model.ZipFilePath, false);
+
+ model.TemporaryDirectoryPath = Path.Combine(SystemDirectories.Data, tempDir);
+ model.Name = ins.Name;
+ model.Author = ins.Author;
+ model.AuthorUrl = ins.AuthorUrl;
+ model.License = ins.License;
+ model.LicenseUrl = ins.LicenseUrl;
+ model.ReadMe = ins.ReadMe;
+ model.ConflictingMacroAliases = ins.ConflictingMacroAliases;
+ model.ConflictingStyleSheetNames = ins.ConflictingStyleSheetNames;
+ model.ConflictingTemplateAliases = ins.ConflictingTemplateAliases;
+ model.ContainsBinaryFileErrors = ins.ContainsBinaryFileErrors;
+ model.ContainsLegacyPropertyEditors = ins.ContainsLegacyPropertyEditors;
+ model.ContainsMacroConflict = ins.ContainsMacroConflict;
+ model.ContainsStyleSheetConflicts = ins.ContainsStyleSheeConflicts;
+ model.ContainsTemplateConflicts = ins.ContainsTemplateConflicts;
+ model.ContainsUnsecureFiles = ins.ContainsUnsecureFiles;
+ model.Url = ins.Url;
+ model.Version = ins.Version;
+
+ model.UmbracoVersion = ins.RequirementsType == RequirementsType.Strict
+ ? string.Format("{0}.{1}.{2}", ins.RequirementsMajor, ins.RequirementsMinor, ins.RequirementsPatch)
+ : string.Empty;
+
+ //now we need to check for version comparison
+ model.IsCompatible = true;
+ if (ins.RequirementsType == RequirementsType.Strict)
+ {
+ var packageMinVersion = new System.Version(ins.RequirementsMajor, ins.RequirementsMinor, ins.RequirementsPatch);
+ if (UmbracoVersion.Current < packageMinVersion)
+ {
+ model.IsCompatible = false;
+ }
+ }
+ }
+
[HttpPost]
[FileUploadCleanupFilter(false)]
public async Task UploadLocalPackage()
@@ -269,65 +311,14 @@ namespace Umbraco.Web.Editors
//the file name must be a GUID - this is what the packager expects (strange yes)
//because essentially this is creating a temporary package Id that will be used
//for unpacking/installing/etc...
- var packageTempFileName = model.PackageGuid + ".umb";
- var packageTempFileLocation = Path.Combine(packageTempDir, packageTempFileName);
+ model.ZipFilePath = model.PackageGuid + ".umb";
+ var packageTempFileLocation = Path.Combine(packageTempDir, model.ZipFilePath);
File.Copy(file.LocalFileName, packageTempFileLocation, true);
- try
- {
- var ins = new global::umbraco.cms.businesslogic.packager.Installer(Security.CurrentUser.Id);
- //this will load in all the metadata too
- var tempDir = ins.Import(packageTempFileName);
+ //Populate the model from the metadata in the package file (zip file)
+ PopulateFromPackageData(model);
- //now we need to check for version comparison
- if (ins.RequirementsType == RequirementsType.Strict)
- {
- var packageMinVersion = new System.Version(ins.RequirementsMajor, ins.RequirementsMinor, ins.RequirementsPatch);
- if (UmbracoVersion.Current < packageMinVersion)
- {
- throw new HttpResponseException(Request.CreateNotificationValidationErrorResponse("This package cannot be installed, it requires a minimum Umbraco version of " + packageMinVersion));
- }
- }
-
- model.TemporaryDirectoryPath = Path.Combine(SystemDirectories.Data, tempDir);
- model.Id = ins.CreateManifest(
- IOHelper.MapPath(model.TemporaryDirectoryPath),
- model.PackageGuid.ToString(),
- //TODO: Does this matter? we're installing a local package
- string.Empty);
-
- model.Name = ins.Name;
- model.Author = ins.Author;
- model.AuthorUrl = ins.AuthorUrl;
- model.License = ins.License;
- model.LicenseUrl = ins.LicenseUrl;
- model.ReadMe = ins.ReadMe;
- model.ConflictingMacroAliases = ins.ConflictingMacroAliases;
- model.ConflictingStyleSheetNames = ins.ConflictingStyleSheetNames;
- model.ConflictingTemplateAliases = ins.ConflictingTemplateAliases;
- model.ContainsBinaryFileErrors = ins.ContainsBinaryFileErrors;
- model.ContainsLegacyPropertyEditors = ins.ContainsLegacyPropertyEditors;
- model.ContainsMacroConflict = ins.ContainsMacroConflict;
- model.ContainsStyleSheetConflicts = ins.ContainsStyleSheeConflicts;
- model.ContainsTemplateConflicts = ins.ContainsTemplateConflicts;
- model.ContainsUnsecureFiles = ins.ContainsUnsecureFiles;
- model.Url = ins.Url;
- model.Version = ins.Version;
-
- model.UmbracoVersion = ins.RequirementsType == RequirementsType.Strict
- ? string.Format("{0}.{1}.{2}", ins.RequirementsMajor, ins.RequirementsMinor, ins.RequirementsPatch)
- : string.Empty;
-
- //TODO: We need to add the 'strict' requirement to the installer
- }
- finally
- {
- //Cleanup file
- if (File.Exists(packageTempFileLocation))
- {
- File.Delete(packageTempFileLocation);
- }
- }
+ //TODO: We need to add the 'strict' requirement to the installer
}
else
{
@@ -349,7 +340,7 @@ namespace Umbraco.Web.Editors
///
///
@@ -380,7 +375,19 @@ namespace Umbraco.Web.Editors
public PackageInstallModel Import(PackageInstallModel model)
{
var ins = new global::umbraco.cms.businesslogic.packager.Installer(Security.CurrentUser.Id);
- model.TemporaryDirectoryPath = Path.Combine(SystemDirectories.Data, ins.Import(model.ZipFilePath));
+
+ var tempPath = ins.Import(model.ZipFilePath);
+ //now we need to check for version comparison
+ if (ins.RequirementsType == RequirementsType.Strict)
+ {
+ var packageMinVersion = new System.Version(ins.RequirementsMajor, ins.RequirementsMinor, ins.RequirementsPatch);
+ if (UmbracoVersion.Current < packageMinVersion)
+ {
+ throw new HttpResponseException(Request.CreateNotificationValidationErrorResponse("This package cannot be installed, it requires a minimum Umbraco version of " + packageMinVersion));
+ }
+ }
+
+ model.TemporaryDirectoryPath = Path.Combine(SystemDirectories.Data, tempPath);
model.Id = ins.CreateManifest( IOHelper.MapPath(model.TemporaryDirectoryPath), model.PackageGuid.ToString(), model.RepositoryGuid.ToString());
return model;
@@ -423,6 +430,7 @@ namespace Umbraco.Web.Editors
public PackageInstallResult CleanUp(PackageInstallModel model)
{
var ins = new global::umbraco.cms.businesslogic.packager.Installer(Security.CurrentUser.Id);
+ var tempDir = IOHelper.MapPath(model.TemporaryDirectoryPath);
ins.LoadConfig(IOHelper.MapPath(model.TemporaryDirectoryPath));
ins.InstallCleanUp(model.Id, IOHelper.MapPath(model.TemporaryDirectoryPath));
@@ -435,6 +443,20 @@ namespace Umbraco.Web.Editors
global::umbraco.BusinessLogic.Actions.Action.ReRegisterActionsAndHandlers();
+ var redirectUrl = "";
+ if (ins.Control.IsNullOrWhiteSpace())
+ {
+ redirectUrl = string.Format("/developer/framed/{0}",
+ Uri.EscapeDataString(
+ string.Format("/umbraco/developer/Packages/installer.aspx?installing=custominstaller&dir={0}&pId={1}&customUrl={2}", tempDir, model.Id, ins.Url)));
+ }
+ else
+ {
+ redirectUrl = string.Format("/developer/framed/{0}",
+ Uri.EscapeDataString(
+ string.Format("/umbraco/developer/Packages/installer.aspx?installing=custominstaller&dir={0}&pId={1}&customControl={2}&customUrl={3}", tempDir, model.Id, ins.Control, ins.Url)));
+ }
+
return new PackageInstallResult
{
Id = model.Id,
@@ -442,8 +464,9 @@ namespace Umbraco.Web.Editors
PackageGuid = model.PackageGuid,
RepositoryGuid = model.RepositoryGuid,
TemporaryDirectoryPath = model.TemporaryDirectoryPath,
-
+ PostInstallationPath = redirectUrl
};
+
}
diff --git a/src/Umbraco.Web/Models/LocalPackageInstallModel.cs b/src/Umbraco.Web/Models/LocalPackageInstallModel.cs
index 20cf359ae1..abb7c85cec 100644
--- a/src/Umbraco.Web/Models/LocalPackageInstallModel.cs
+++ b/src/Umbraco.Web/Models/LocalPackageInstallModel.cs
@@ -21,6 +21,12 @@ namespace Umbraco.Web.Models
[DataMember(Name = "notifications")]
public List Notifications { get; private set; }
+ ///
+ /// A flag to determine if this package is compatible to be installed
+ ///
+ [DataMember(Name = "isCompatible")]
+ public bool IsCompatible { get; set; }
+
///
/// The minimum umbraco version that this package is pinned to
///
diff --git a/src/Umbraco.Web/Models/PackageInstallResult.cs b/src/Umbraco.Web/Models/PackageInstallResult.cs
index bffc1240cf..bb76bc663b 100644
--- a/src/Umbraco.Web/Models/PackageInstallResult.cs
+++ b/src/Umbraco.Web/Models/PackageInstallResult.cs
@@ -9,6 +9,6 @@ namespace Umbraco.Web.Models
public class PackageInstallResult : PackageInstallModel
{
[DataMember(Name = "postInstallationPath")]
- public Guid PostInstallationPath { get; set; }
+ public string PostInstallationPath { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs
index 1e013da452..6c4eef7862 100644
--- a/src/Umbraco.Web/umbraco.presentation/content.cs
+++ b/src/Umbraco.Web/umbraco.presentation/content.cs
@@ -331,6 +331,9 @@ namespace umbraco
using (var safeXml = GetSafeXmlWriter(false))
{
+ //TODO: This can be null: safeXml.Xml!!!!
+
+
var node = safeXml.Xml.GetElementById(c.Id.ToString(CultureInfo.InvariantCulture));
if (node == null) return;
var attr = node.GetAttributeNode("sortOrder");
diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs
index fc3da251fd..fc3c866327 100644
--- a/src/umbraco.cms/businesslogic/Packager/Installer.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs
@@ -178,24 +178,25 @@ namespace umbraco.cms.businesslogic.packager
///
/// Imports the specified package
///
- /// Filename of the umbracopackage
+ /// Filename of the umbracopackage
+ /// true if the input file should be deleted after import
/// (
- () => "Importing package file " + InputFile,
- () => "Package file " + InputFile + "imported"))
+ () => "Importing package file " + inputFile,
+ () => "Package file " + inputFile + "imported"))
{
var tempDir = "";
- if (File.Exists(IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + InputFile)))
+ if (File.Exists(IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + inputFile)))
{
- var fi = new FileInfo(IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + InputFile));
+ var fi = new FileInfo(IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + inputFile));
// Check if the file is a valid package
if (fi.Extension.ToLower() == ".umb")
{
try
{
- tempDir = UnPack(fi.FullName);
+ tempDir = UnPack(fi.FullName, deleteFile);
LoadConfig(tempDir);
}
catch (Exception unpackE)
@@ -207,9 +208,20 @@ namespace umbraco.cms.businesslogic.packager
throw new Exception("Error - file isn't a package (doesn't have a .umb extension). Check if the file automatically got named '.zip' upon download.");
}
else
- throw new Exception("Error - file not found. Could find file named '" + IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + InputFile) + "'");
+ throw new Exception("Error - file not found. Could find file named '" + IOHelper.MapPath(SystemDirectories.Data + Path.DirectorySeparatorChar + inputFile) + "'");
return tempDir;
}
+
+ }
+
+ ///
+ /// Imports the specified package
+ ///
+ /// Filename of the umbracopackage
+ ///
{{vm.installState.status}}
-
+
-
+
- ![]()
+ ![]()
{{ vm.package.ownerInfo.owner }}
@@ -227,8 +227,67 @@
+
+
+
+
+