Merge pull request #111 from arthur-schnitzler/main

hot fix for json-download of network data
acdh-oeaw · Nov 26, 2024 · da7ec6d · da7ec6d
2 parents a8526c3 + a49a5c5
commit da7ec6d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/network/templates/network/list_view.html b/network/templates/network/list_view.html
@@ -16,7 +16,7 @@ <h1 class="display-1 text-center">
             <h2>Download</h2>
             <div class="btn-group" role="group" class="text-end">
                 <a type="button" class="btn btn-outline-primary" href="{% url 'network:data' %}{% querystring %}&format=csv">CSV</a>
-                <a type="button" class="btn btn-outline-primary" href="{% url 'network:data' %}{% querystring %}&format=json">JSON</a>
+                <a type="button" class="btn btn-outline-primary" href="{% url 'network:data' %}{% querystring %}&format=cosmograph">JSON</a>
             </div>
         </div>
         <div class="col-md-6 text-center">
@@ -84,11 +84,7 @@ <h2 class="text-center">{{ total }} Result(s)</h2>
 </nav>
 
                 {% endblock pagination.allpages %}
-                {% if download %}
-                <div class="float-end">
-                    {% include "browsing/partials/download_menu.html" %}
-                </div>
-                {% endif %}
+
             </div>
         </div>
     </div>

diff --git a/network/views.py b/network/views.py
@@ -54,6 +54,7 @@ def network_data(request):
         df["end_date"] = df["end_date"].dt.strftime("%Y-%m-%d").fillna("")
         out = df.to_json(orient="index", force_ascii=False)
         response = JsonResponse(json.loads(out))
+        return response
     elif format == "cosmograph":
         data = {}
         edge_data = df.apply(