Forces Django into thinking nan values are strings. Uses request to b…

…uild CSV download string
uktrade · Oct 15, 2024 · b66e676 · b66e676
1 parent ee085d8
commit b66e676
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/orp/orp_search/templates/orp.html b/orp/orp_search/templates/orp.html
@@ -190,24 +190,10 @@ <h2 class="govuk-fieldset__heading">
         </button>
         <hr class="govuk-section-break govuk-section-break--m govuk-section-break--visible">
         <p class="govuk-body">
-          <a id="download-csv-link" href="#"
+          <a id="download-csv-link" href="download_csv/?{{ request.META.QUERY_STRING }}"
             class="govuk-link govuk-link--no-visited-state govuk-!-float-right">Download search results as CSV
             file</a>
         </p>
-
-        <script>
-          // Function to get the current query parameters from the address bar
-          function getQueryParameters() {
-            return window.location.search;
-          }
-
-          document.addEventListener('DOMContentLoaded', function () {
-            var csvLink = document.getElementById('download-csv-link');
-            var queryParams = getQueryParameters();
-            var baseURL = '{% url "download_csv" %}';
-            csvLink.href = baseURL + queryParams;
-          });
-        </script>
       </form>
     </div>
 

diff --git a/orp/orp_search/views.py b/orp/orp_search/views.py
@@ -40,17 +40,17 @@ def document(request: HttpRequest, id) -> HttpResponse:
     public_gateway = PublicGateway()
     try:
         search_result = public_gateway.search(config)
-        logger.info("search result: %s", search_result)
+        # logger.info("search result: %s", search_result)
 
         if "regulatory_topics" in search_result:
-            search_result["regulatory_topics"] = search_result[
-                "regulatory_topics"
-            ].split("\n")
+            search_result["regulatory_topics"] = str(
+                search_result["regulatory_topics"]
+            ).split("\n")
 
         if "related_legislation" in search_result:
-            search_result["related_legislation"] = search_result[
-                "related_legislation"
-            ].split("\n")
+            search_result["related_legislation"] = str(
+                search_result["related_legislation"]
+            ).split("\n")
 
         context["result"] = search_result
         return render(request, template_name="document.html", context=context)