Merge remote-tracking branch '4teamwork/fix_embedded_view'

abstract-open-solutions · Sep 11, 2015 · 37c2148 · 37c2148
2 parents 276df36 + 3aeb6be
commit 37c2148
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,9 @@ Change History
 1.8.0b5 (unreleased)
 --------------------
 
+- Fix embedded view by removing deprecated global defines macro.
+  [buchi]
+
 - Removed inline javascript that tried to block inline validation.  It
   had no effect anymore on Plone 5, as no inline validation is done
   here anyway.  And it interferes with themes that load jQuery near

diff --git a/Products/PloneFormGen/skins/PloneFormGen/fg_embedded_view_p3.cpt b/Products/PloneFormGen/skins/PloneFormGen/fg_embedded_view_p3.cpt
@@ -1,4 +1,3 @@
-<metal:block use-macro="here/global_defines/macros/defines" />
 <div class="pfg-embedded">
     <tal:block tal:condition="python:request.other.get('pfg_form_submitted', False)">