Fix exception when syndicalize NITF

collective · May 20, 2016 · 79706aa · 79706aa
1 parent 8c6fb00
commit 79706aa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,6 +6,9 @@ There's a frood who really knows where his towel is.
 2.0b2 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
+- Fix exception when syndicalize NITF (closes `161`_).
+  [rodfersou]
+
 - Fix tile date format.
   [hvelarde]
 
@@ -132,3 +135,4 @@ There's a frood who really knows where his towel is.
 .. _`#133`: https://github.com/collective/collective.nitf/issues/133
 .. _`#137`: https://github.com/collective/collective.nitf/issues/137
 .. _`#154`: https://github.com/collective/collective.nitf/issues/154
+.. _`#161`: https://github.com/collective/collective.nitf/issues/161
diff --git a/src/collective/nitf/browser/templates/view.pt b/src/collective/nitf/browser/templates/view.pt
@@ -15,8 +15,7 @@
   <body>
     <metal:main fill-slot="main">
       <article vocab="http://schema.org/" typeof="Article"
-          prefix="rnews: http://iptc.org/std/rNews/2011-10-07#"
-          tal:define="text context/text/output|nothing">
+          prefix="rnews: http://iptc.org/std/rNews/2011-10-07#">
         <div tal:replace="structure provider:plone.abovecontenttitle" />
 
         <p property="rnews:articleSection" class="section"
@@ -34,6 +33,8 @@
         <div tal:replace="structure provider:plone.abovecontentbody" />
 
         <div id="content-core">
+        <metal:block define-macro="content-core"
+          tal:define="text context/text/output|nothing">
           <p tal:define="is_editable context/@@plone_context_state/is_editable"
              tal:condition="python:not text and is_editable"
              i18n:domain="plone"
@@ -46,6 +47,7 @@
                tal:condition="text">
               <div property="rnews:articleBody" tal:content="structure text">The body</div>
           </div>
+        </metal:block>
         </div>
 
         <div tal:replace="structure provider:plone.belowcontentbody" />