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

U4-8733 Trying to include a stylesheet in a package results in a YSOD

Browse Source
This commit is contained in:
Claus
2016-07-26 13:38:06 +02:00
parent c206965f88
commit 379a0d68f7
3 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs
View File

@@ -114,16 +114,18 @@ namespace umbraco.presentation.developer.packages
}
/*Stylesheets */
StyleSheet[] sheets = StyleSheet.GetAll();
foreach (StyleSheet st in sheets)
var sheets = Services.FileService.GetStylesheets();
foreach (var st in sheets)
{
ListItem li = new ListItem(st.Text, st.Id.ToString());
if (pack.Stylesheets.Contains(st.Id.ToString()))
li.Selected = true;
stylesheets.Items.Add(li);
if (string.IsNullOrEmpty(st.Name) == false)
{
var li = new ListItem(st.Alias, st.Name);
if (pack.Stylesheets.Contains(st.Name))
li.Selected = true;
stylesheets.Items.Add(li);
}
}
/* MACROS */
Macro[] umbMacros = Macro.GetAll();
foreach (Macro m in umbMacros)

9
src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
View File

@@ -246,13 +246,10 @@ namespace umbraco.cms.businesslogic.packager
//Stylesheets
var stylesheets = _packageManifest.CreateElement("Stylesheets");
foreach (var ssId in pack.Stylesheets)
foreach (var stylesheetName in pack.Stylesheets)
{
if (int.TryParse(ssId, out outInt))
{
var s = new StyleSheet(outInt);
stylesheets.AppendChild(s.ToXml(_packageManifest));
}
var stylesheetXmlNode = utill.Stylesheet(stylesheetName, true, _packageManifest);
stylesheets.AppendChild(stylesheetXmlNode);
}
AppendElement(stylesheets);

38
src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs
View File

@@ -92,37 +92,39 @@ namespace umbraco.cms.businesslogic.packager {
return template;
}
/// <summary>
/// Converts a umbraco stylesheet to a package xml node
/// </summary>
/// <param name="ssId">The ss id.</param>
/// <param name="incluceProperties">if set to <c>true</c> [incluce properties].</param>
/// <param name="name">The name of the stylesheet.</param>
/// <param name="includeProperties">if set to <c>true</c> [incluce properties].</param>
/// <param name="doc">The doc.</param>
/// <returns></returns>
public static XmlNode Stylesheet(int ssId, bool incluceProperties, XmlDocument doc) {
StyleSheet sts = new StyleSheet(ssId);
XmlNode stylesheet = doc.CreateElement("Stylesheet");
stylesheet.AppendChild(_node("Name", sts.Text, doc));
stylesheet.AppendChild(_node("FileName", sts.Filename, doc));
public static XmlNode Stylesheet(string name, bool includeProperties, XmlDocument doc)
{
if (ApplicationContext.Current == null)
throw new NullReferenceException("ApplicationContext is null");
var fileService = ApplicationContext.Current.Services.FileService;
var sts = fileService.GetStylesheetByName(name);
var stylesheet = doc.CreateElement("Stylesheet");
stylesheet.AppendChild(_node("Name", sts.Alias, doc));
stylesheet.AppendChild(_node("FileName", sts.Name, doc));
stylesheet.AppendChild(_node("Content", "<![CDATA[" + sts.Content + "]]>", doc));
if (incluceProperties) {
XmlNode properties = doc.CreateElement("Properties");
foreach (StylesheetProperty ssP in sts.Properties) {
XmlNode property = doc.CreateElement("Property");
property.AppendChild(_node("Name", ssP.Text, doc));
if (includeProperties)
{
var properties = doc.CreateElement("Properties");
foreach (var ssP in sts.Properties)
{
var property = doc.CreateElement("Property");
property.AppendChild(_node("Name", ssP.Name, doc));
property.AppendChild(_node("Alias", ssP.Alias, doc));
property.AppendChild(_node("Value", ssP.value, doc));
//xnode += "<Property><Name>" + ssP.Text + "</Name><Alias>" + ssP.Alias + "</Alias><Value>" + ssP.value + "</Value></Property>\n";
property.AppendChild(_node("Value", ssP.Value, doc));
}
stylesheet.AppendChild(properties);
}
return stylesheet;
}
/// <summary>
/// Converts a macro to a package xml node
/// </summary>