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

Merge pull request #9899 from umbraco/netcore/bugfix/packages-with-actions

Browse Source 
Netcore: Fix packages with actions
This commit is contained in:
Bjarke Berg
2021-02-26 10:34:14 +01:00
committed by GitHub
parent f6cf089357 70b04e8a8a
commit 5b88fbe970
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs
View File

@@ -106,22 +106,39 @@ namespace Umbraco.Cms.Core.Packaging
private IEnumerable<string> RunPackageActions(PackageDefinition packageDefinition, IEnumerable<PackageAction> actions)
{
foreach (var n in actions)
var actionsElement = XElement.Parse(packageDefinition.Actions);
foreach (PackageAction action in actions)
{
//if there is an undo section then save it to the definition so we can run it at uninstallation
var undo = n.Undo;
var undo = action.Undo;
if (undo)
packageDefinition.Actions += n.XmlData.ToString();
{
actionsElement.Add(action.XmlData);
}
//Run the actions tagged only for 'install'
if (n.RunAt != ActionRunAt.Install) continue;
if (action.RunAt != ActionRunAt.Install)
{
continue;
}
if (n.Alias.IsNullOrWhiteSpace()) continue;
if (action.Alias.IsNullOrWhiteSpace())
{
continue;
}
//run the actions and report errors
if (!_packageActionRunner.RunPackageAction(packageDefinition.Name, n.Alias, n.XmlData, out var err))
foreach (var e in err) yield return e;
if (!_packageActionRunner.RunPackageAction(packageDefinition.Name, action.Alias, action.XmlData, out var err))
{
foreach (var e in err)
{
yield return e;
}
}
}
packageDefinition.Actions = actionsElement.ToString();
}
private IEnumerable<string> UndoPackageActions(IPackageInfo packageDefinition, IEnumerable<PackageAction> actions)

2
src/Umbraco.Web.UI.Client/src/views/packages/edit.html
View File

@@ -175,7 +175,7 @@
<div ng-repeat="template in ::vm.templates | orderBy:'name'">
<umb-checkbox model="template.selected"
on-change="vm.selectTemplate(template)"
text="{{template.name}}">umb-expansion-panel__content
text="{{template.name}}">
</umb-checkbox>
</div>
</umb-control-group>