diff --git a/src/Umbraco.Core/Models/Packaging/PackageDefinition.cs b/src/Umbraco.Core/Models/Packaging/PackageDefinition.cs index 67d0c2970f..01d10fa2e1 100644 --- a/src/Umbraco.Core/Models/Packaging/PackageDefinition.cs +++ b/src/Umbraco.Core/Models/Packaging/PackageDefinition.cs @@ -94,7 +94,7 @@ namespace Umbraco.Core.Models.Packaging public string LoadControl { get; set; } = string.Empty; [DataMember(Name = "actions")] - public string Actions { get; set; } + public string Actions { get; set; } = ""; [DataMember(Name = "dataTypes")] public IList DataTypes { get; set; } = new List(); diff --git a/src/Umbraco.Core/Packaging/PackageBuilder.cs b/src/Umbraco.Core/Packaging/PackageBuilder.cs index 6b26b09cbe..ae5accf794 100644 --- a/src/Umbraco.Core/Packaging/PackageBuilder.cs +++ b/src/Umbraco.Core/Packaging/PackageBuilder.cs @@ -598,7 +598,7 @@ namespace Umbraco.Core.Packaging Author = xml.Element("author")?.Value ?? string.Empty, AuthorUrl = xml.Element("author")?.AttributeValue("url") ?? string.Empty, Readme = xml.Element("readme")?.Value ?? string.Empty, - Actions = xml.Element("actions")?.ToString(SaveOptions.None) ?? string.Empty, //take the entire outer xml value + Actions = xml.Element("actions")?.ToString(SaveOptions.None) ?? "", //take the entire outer xml value ContentNodeId = xml.Element("content")?.AttributeValue("nodeId") ?? string.Empty, ContentLoadChildNodes = xml.Element("content")?.AttributeValue("loadChildNodes") ?? false, Macros = xml.Element("macros")?.Value.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).ToList() ?? new List(), diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js index f351456609..057f1160c2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packages/edit.controller.js @@ -146,7 +146,7 @@ if (create) { //if we are creating, then redirect to the correct url and reload - $location.path("packages/packages/overview/" + vm.package.id).search("subview", "created"); + $location.path("packages/packages/edit/" + vm.package.id).search("subview", "created").search("create", null); //don't add a browser history for this $location.replace(); }