Merge pull request #5463 from vxsx/bugfix/script-template-tags

Moved child-plugin-classes templates out of "js" sekizai block

CHANGELOG.txt

@@ -32,6 +32,8 @@
   mode.
 * Fixed a bug where users with limited permissions could not interact with
   page tree dropdowns.
+* Fixed a bug where Django Compressor could not be used on the sekizai ``js``
+  block.
 
 
 === 3.3.0 (2016-05-26) ===

cms/templates/cms/toolbar/placeholder.html

@@ -2,6 +2,11 @@
 {% load i18n l10n sekizai_tags %}
 
 <div class="cms-placeholder cms-placeholder-{{ placeholder.pk|unlocalize }}"></div>
+{% language request.toolbar.toolbar_language %}
+<script id="cms-plugin-child-classes-{{ placeholder.pk|unlocalize }}" type="text/cms-template">
+    {% include request.toolbar.drag_item_menu_template %}
+</script>
+{% endlanguage %}
 
 {% endspaceless %}{% addtoblock "js" %}
 {% language request.toolbar.toolbar_language %}
@@ -20,8 +25,5 @@
     }
 }]);
 </script>
-<script id="cms-plugin-child-classes-{{ placeholder.pk|unlocalize }}" type="text/cms-template">
-    {% include request.toolbar.drag_item_menu_template %}
-</script>
 {% endlanguage %}
 {% endaddtoblock %}

cms/tests/test_toolbar.py

@@ -1058,10 +1058,15 @@ def test_edit_render_placeholder(self):
         response = detail_view(request, ex1.pk, template_string=template_text)
         self.assertContains(
             response,
-            '<h1><div class="cms-placeholder cms-placeholder-{0}"></div>\n'
-            '<div class="cms-plugin cms-plugin-{1}">{2}</div></h1>'.format(ex1.placeholder.pk,
-                                                                           plugin.pk, render_placeholder_body)
-            )
+            '<h1><div class="cms-placeholder cms-placeholder-{0}"></div>'.format(ex1.placeholder.pk))
+
+        self.assertContains(
+            response,
+            '<script id="cms-plugin-child-classes-{0}" type="text/cms-template">'.format(ex1.placeholder.pk))
+
+        self.assertContains(
+            response,
+            '<div class="cms-plugin cms-plugin-{0}">{1}</div></h1>'.format(plugin.pk, render_placeholder_body))
 
         self.assertContains(
             response,