From 568928215eee69f52fd665cfa0cfeff4fb18da2e Mon Sep 17 00:00:00 2001
From: Matt Westcott <matthew@west.co.tt>
Date: Mon, 28 May 2018 12:54:00 +0100
Subject: [PATCH] Eliminate template tags from privacy setting view JS

---
 .../wagtailadmin/collection_privacy/set_privacy_done.js   | 4 ++--
 .../wagtailadmin/page_privacy/set_privacy_done.js         | 4 ++--
 wagtail/admin/tests/test_privacy.py                       | 8 ++++----
 wagtail/admin/views/collection_privacy.py                 | 3 ++-
 wagtail/admin/views/page_privacy.py                       | 3 ++-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/wagtail/admin/templates/wagtailadmin/collection_privacy/set_privacy_done.js b/wagtail/admin/templates/wagtailadmin/collection_privacy/set_privacy_done.js
index dafbc7b36..a334c2334 100644
--- a/wagtail/admin/templates/wagtailadmin/collection_privacy/set_privacy_done.js
+++ b/wagtail/admin/templates/wagtailadmin/collection_privacy/set_privacy_done.js
@@ -1,4 +1,4 @@
-function(modal) {
-    modal.respond('setPermission', {% if is_public %}true{% else %}false{% endif %});
+function(modal, jsonData) {
+    modal.respond('setPermission', jsonData['is_public']);
     modal.close();
 }
diff --git a/wagtail/admin/templates/wagtailadmin/page_privacy/set_privacy_done.js b/wagtail/admin/templates/wagtailadmin/page_privacy/set_privacy_done.js
index dafbc7b36..a334c2334 100644
--- a/wagtail/admin/templates/wagtailadmin/page_privacy/set_privacy_done.js
+++ b/wagtail/admin/templates/wagtailadmin/page_privacy/set_privacy_done.js
@@ -1,4 +1,4 @@
-function(modal) {
-    modal.respond('setPermission', {% if is_public %}true{% else %}false{% endif %});
+function(modal, jsonData) {
+    modal.respond('setPermission', jsonData['is_public']);
     modal.close();
 }
diff --git a/wagtail/admin/tests/test_privacy.py b/wagtail/admin/tests/test_privacy.py
index f68029d6d..d4e2a7b1d 100644
--- a/wagtail/admin/tests/test_privacy.py
+++ b/wagtail/admin/tests/test_privacy.py
@@ -108,7 +108,7 @@ class TestSetPrivacyView(TestCase, WagtailTestUtils):
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "modal.respond('setPermission', false);")
+        self.assertContains(response, '"is_public": false')
 
         # Check that a page restriction has been created
         self.assertTrue(PageViewRestriction.objects.filter(page=self.public_page).exists())
@@ -154,7 +154,7 @@ class TestSetPrivacyView(TestCase, WagtailTestUtils):
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "modal.respond('setPermission', true);")
+        self.assertContains(response, '"is_public": true')
 
         # Check that the page restriction has been deleted
         self.assertFalse(PageViewRestriction.objects.filter(page=self.private_page).exists())
@@ -188,7 +188,7 @@ class TestSetPrivacyView(TestCase, WagtailTestUtils):
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "modal.respond('setPermission', false);")
+        self.assertContains(response, '"is_public": false')
 
         # Check that a page restriction has been created
         self.assertTrue(PageViewRestriction.objects.filter(page=self.public_page).exists())
@@ -237,7 +237,7 @@ class TestSetPrivacyView(TestCase, WagtailTestUtils):
 
         # Check response
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "modal.respond('setPermission', true);")
+        self.assertContains(response, '"is_public": true')
 
         # Check that the page restriction has been deleted
         self.assertFalse(PageViewRestriction.objects.filter(page=self.private_page).exists())
diff --git a/wagtail/admin/views/collection_privacy.py b/wagtail/admin/views/collection_privacy.py
index 9c29efe3b..a604774f4 100644
--- a/wagtail/admin/views/collection_privacy.py
+++ b/wagtail/admin/views/collection_privacy.py
@@ -34,7 +34,8 @@ def set_privacy(request, collection_id):
                 form.save()
 
             return render_modal_workflow(
-                request, None, 'wagtailadmin/collection_privacy/set_privacy_done.js', {
+                request, None, 'wagtailadmin/collection_privacy/set_privacy_done.js',
+                None, json_data={
                     'is_public': (form.cleaned_data['restriction_type'] == 'none')
                 }
             )
diff --git a/wagtail/admin/views/page_privacy.py b/wagtail/admin/views/page_privacy.py
index bc50f8880..a022f0f00 100644
--- a/wagtail/admin/views/page_privacy.py
+++ b/wagtail/admin/views/page_privacy.py
@@ -34,7 +34,8 @@ def set_privacy(request, page_id):
                 form.save()
 
             return render_modal_workflow(
-                request, None, 'wagtailadmin/page_privacy/set_privacy_done.js', {
+                request, None, 'wagtailadmin/page_privacy/set_privacy_done.js',
+                None, json_data={
                     'is_public': (form.cleaned_data['restriction_type'] == 'none')
                 }
             )