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

U4-8981 - fix package actions

Browse Source
This commit is contained in:
Stephan
2016-10-19 08:48:35 +02:00
parent fe9686f215
commit 2b2734cd66
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/umbraco.cms/businesslogic/Packager/data.cs
View File

@@ -236,7 +236,7 @@ namespace umbraco.cms.businesslogic.packager
retVal.ContentNodeId = SafeAttribute("nodeId", n.SelectSingleNode("content")); retVal.ContentNodeId = SafeAttribute("nodeId", n.SelectSingleNode("content"));
retVal.ContentLoadChildNodes = bool.Parse(SafeAttribute("loadChildNodes", n.SelectSingleNode("content"))); retVal.ContentLoadChildNodes = bool.Parse(SafeAttribute("loadChildNodes", n.SelectSingleNode("content")));
retVal.Macros = new List<string>(SafeNodeValue(n.SelectSingleNode("macros")).Trim(',').Split(',')); retVal.Macros = new List<string>(SafeNodeValue(n.SelectSingleNode("macros")).Trim(',').Split(','));
retVal.Macros = new List<string>(SafeNodeValue(n.SelectSingleNode("macros")).Trim(',').Split(',')); retVal.Macros = new List<string>(SafeNodeValue(n.SelectSingleNode("macros")).Trim(',').Split(','));
retVal.Templates = new List<string>(SafeNodeValue(n.SelectSingleNode("templates")).Trim(',').Split(',')); retVal.Templates = new List<string>(SafeNodeValue(n.SelectSingleNode("templates")).Trim(',').Split(','));
@@ -264,7 +264,7 @@ namespace umbraco.cms.businesslogic.packager
// Remove physical xml file if any // Remove physical xml file if any
//PackageInstance p = new PackageInstance(Id); //PackageInstance p = new PackageInstance(Id);
//TODO DELETE PACKAGE FOLDER... //TODO DELETE PACKAGE FOLDER...
//p.Folder //p.Folder
XmlNode n = data.GetFromId(Id, dataSource, true); XmlNode n = data.GetFromId(Id, dataSource, true);
@@ -323,7 +323,7 @@ namespace umbraco.cms.businesslogic.packager
XmlHelper.SetAttribute(Source, authorNode, "url", package.AuthorUrl); XmlHelper.SetAttribute(Source, authorNode, "url", package.AuthorUrl);
XmlHelper.SetCDataNode(Source, xmlDef, "readme", package.Readme); XmlHelper.SetCDataNode(Source, xmlDef, "readme", package.Readme);
XmlHelper.SetTextNode(Source, xmlDef, "actions", package.Actions); XmlHelper.SetInnerXmlNode(Source, xmlDef, "actions", package.Actions);
var contentNode = xmlDef.SelectSingleNode("content"); var contentNode = xmlDef.SelectSingleNode("content");
if (contentNode == null) if (contentNode == null)