Handle if-content=""

plone · May 15, 2012 · b7d5047 · b7d5047
1 parent ef5e4d0
commit b7d5047
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/diazo/emit-stylesheet.xsl b/lib/diazo/emit-stylesheet.xsl
@@ -460,7 +460,9 @@
                      <xsl:text>&quot;</xsl:text>
                  </xsl:for-each>
                  <xsl:text>&gt;</xsl:text>
-                 <xsl:element name="xsl:value-of"><xsl:attribute name="select">count(<xsl:value-of select="$attr"/>)</xsl:attribute></xsl:element>
+                 <xsl:if test="string($attr)">
+                     <xsl:element name="xsl:value-of"><xsl:attribute name="select">count(<xsl:value-of select="$attr"/>)</xsl:attribute></xsl:element>
+                 </xsl:if>
                  <xsl:text>&lt;/runtrace&gt;</xsl:text>
                </xsl:element>
                <xsl:text>&#10;</xsl:text>

diff --git a/lib/diazo/runtrace.py b/lib/diazo/runtrace.py
@@ -33,7 +33,7 @@ def condition_name(trace):
 
     for trace in trace_doc.xpath('/runtrace/runtrace'):
         for el in rules_doc.xpath("id('"+trace.attrib['theme_xmlid']+"')"):
-            el.set(condition_name(trace),trace.text)
+            el.set(condition_name(trace),trace.text or '')
     return rules_doc
 
 def runtrace_to_html(runtrace_doc):