Sites - Pass Site obj instead of pk when creating a StaticPlaceholder (…

…#6679) * Pass site object instead of pk when rendering menu Add original fix by @saqlainsyed007 * Moved test to it's own class * Update changelog
django-cms · FinalAngel · Nov 12, 2019 · Nov 6, 2019 · Nov 6, 2019 · Nov 7, 2019
commit cb56e872d2b16093eece0d52c10dbc75566e772a
diff --git a/AUTHORS b/AUTHORS
@@ -465,6 +465,7 @@ Contributors (based on gitlog, 543 unique authors):
 * Samuel Lahti
 * Samuel Luescher
 * Samuel Lüscher
+* saqlainsyed007
 * Sascha Marcel Schmidt
 * sbussetti
 * Schoen
@@ -503,6 +504,7 @@ Contributors (based on gitlog, 543 unique authors):
 * Stephan Hepper
 * Stephan Herzog
 * Stephan Jaekel
+* Stephan Michaud
 * Stephen Muss
 * Stephen Paulger
 * Stephen Watkin

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,11 +1,13 @@
 === 3.7.1 (unreleased) ===
 
+* Fixed ``ValueError`` when creating a ``Site``-bound ``StaticPlaceholder``
 * Updated branch policy
 * Improved and simplified permissions documentation
 * Improved apphooks documentation
 * Improved CMSPluginBase documentation
 * Improved documentation related to nested plugins
 
+
 === 3.7.0 (2019-09-25) ===
 
 * Introduced Django 2.2 support.

diff --git a/cms/templatetags/cms_js_tags.py b/cms/templatetags/cms_js_tags.py
@@ -46,7 +46,7 @@ def render_cms_structure_js(context, renderer, obj):
         }

         if static_placeholder.site_bound:
-            kwargs['site'] = renderer.current_site.pk
+            kwargs['site'] = renderer.current_site
         else:
             kwargs['site_id__isnull'] = True
 

diff --git a/cms/test_utils/project/templates/placeholder_tests/static_with_site.html b/cms/test_utils/project/templates/placeholder_tests/static_with_site.html
@@ -0,0 +1,5 @@
+{% load cms_tags %}
+
+{% cms_toolbar %}
+
+{% static_placeholder 'test-static' site %}
diff --git a/cms/tests/test_site.py b/cms/tests/test_site.py
@@ -110,3 +110,20 @@ def test_site_publish(self):
                         page_url = page.get_absolute_url(language='de')
                     response = self.client.get(page_url)
                     self.assertEqual(response.status_code, 200)
+
+
+class TestSiteBoundStaticPlaceholder(SiteTestCase):
+    def setUp(self):
+        super(TestSiteBoundStaticPlaceholder, self).setUp()
+        with self.settings(
+            CMS_TEMPLATES=(('placeholder_tests/static_with_site.html', 'tpl'), ),
+        ):
+            self.test_page = create_page('page', 'placeholder_tests/static_with_site.html', language='de')
+
+    def tearDown(self):
+        self.test_page.delete()
+        super(TestSiteBoundStaticPlaceholder, self).tearDown()
+
+    def test_create_site_specific_placeholder(self):
+            response = self.client.get(self.test_page.get_absolute_url(language='de') + '?structure')
+            self.assertEqual(response.status_code, 200)