Pass site object instead of pk when rendering menu

michauds · michauds · commit 463984d5738c · 2019-05-07T23:02:40.000-04:00
Add original fix by @saqlainsyed007
diff --git a/AUTHORS b/AUTHORS
@@ -459,6 +459,7 @@ Contributors (based on gitlog, 537 unique authors):
 * Samuel Lahti
 * Samuel Luescher
 * Samuel Lüscher
+* saqlainsyed007
 * sbussetti
 * Schoen
 * scottbarnham
@@ -495,6 +496,7 @@ Contributors (based on gitlog, 537 unique authors):
 * Stephan Hepper
 * Stephan Herzog
 * Stephan Jaekel
+* Stephan Michaud
 * Stephen Muss
 * Stephen Paulger
 * Stephen Watkin
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,12 @@ 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)
+
+    def test_create_site_specific_placeholder(self):
+        with self.settings(
+            CMS_TEMPLATES=(('placeholder_tests/static_with_site.html', 'tpl'), ),
+        ):
+            page = create_page('page', 'placeholder_tests/static_with_site.html', language='de')
+
+            response = self.client.get(page.get_absolute_url(language='de') + u'?structure')
+            self.assertEqual(response.status_code, 200)

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ def render_cms_structure_js(context, renderer, obj):`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`if static_placeholder.site_bound:`
`49`		`- kwargs['site'] = renderer.current_site.pk`
	`49`	`+ kwargs['site'] = renderer.current_site`
`50`	`50`	`else:`
`51`	`51`	`kwargs['site_id__isnull'] = True`
`52`	`52`