From 7990e79583aeab5778cc3434e7e1a06711030a96 Mon Sep 17 00:00:00 2001
From: "Jean Cochrane (Lead developer, DataMade)" <jean.cochrane@datamade.us>
Date: Thu, 20 Aug 2020 10:48:10 -0500
Subject: [PATCH 1/2] Use json_script filter to safely cast selected_facets to
 string

---
 councilmatic_core/templates/search/search.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/councilmatic_core/templates/search/search.html b/councilmatic_core/templates/search/search.html
index b6cfbc11..a5b8d8b4 100644
--- a/councilmatic_core/templates/search/search.html
+++ b/councilmatic_core/templates/search/search.html
@@ -275,6 +275,7 @@ <h3 class="modal-links">
 {% endblock %}
 
 {% block extra_js %}
+    {{ selected_facets|json_script:"selected-facets" }}
     <script>
     $(document).ready(function() {
         $("#searchSubscribe").click(function() {
@@ -283,7 +284,7 @@ <h3 class="modal-links">
 
             if ('{{ request.user }}' != 'AnonymousUser') {
                 posturl2 = "/search_check_subscription/"
-                facets2 = JSON.stringify({{selected_facets|safe}});
+                facets2 = $('#selected-facets').text();
                 stuff2 = $.post(posturl2, { query: "{{request.GET.q}}", selected_facets: facets2 },
                     function(data, status) {
                     console.log("returned from post with data: ", data, "status:", status);
@@ -291,7 +292,7 @@ <h3 class="modal-links">
                 console.log("Could not check subscription for interest {{request.GET.q}} with {{facets2}}" );
                 }),
                 posturl = "/search_subscribe/" //+ "{{request.GET.q}}"
-                facets =  JSON.stringify({{selected_facets|safe}});
+                facets =  $('#selected-facets').text();
                 $.post(posturl, { query: "{{request.GET.q}}", selected_facets: facets }).then(function() {
                     $(bullHorn).hide();
                     $(bullHornNew).show();

From cc0d28ccce73c9635abc17fc07ea41f39bebdff8 Mon Sep 17 00:00:00 2001
From: "Jean Cochrane (Lead developer, DataMade)" <jean.cochrane@datamade.us>
Date: Thu, 20 Aug 2020 11:51:52 -0500
Subject: [PATCH 2/2] Bump minimum Django version to 2.1 for json_script

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f6f6bc58..47af0672 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@
                       'opencivicdata>=3.1.0',
                       'pytz>=2015.4',
                       'django-haystack>=2.8.0,<2.9',
-                      'Django>=2.0,<2.2',
+                      'Django>=2.1,<2.2',
                       'django-proxy-overrides>=0.2.1',
                       'python-dateutil>=2.7,<2.8',
                       'pysolr>=3.8,<3.9',