Merge pull request #101 from OpenDataServices/100-download-fix

Fixes download server error. Closes #100

Author: Bjwebb

prefix_finder/frontend/templates/download.html

@@ -9,7 +9,7 @@
         <h3> Download Full Data </h3>
         <br/>
 
-        <p> <a href="{% url 'json_download' %}">JSON: All data in its orignal format.</a></p>
+        <p> <a href="{% url 'json_download' %}">JSON: All data in its original format.</a></p>
         <p> <a href="{% url 'csv_download' %}">CSV: All data in single CSV table.</a></p>
         <p> <a href="{% url 'xml_download' %}">XML: Subset of data in the same format as an IATI codelist.</a></p>
 

prefix_finder/frontend/views.py

@@ -493,9 +493,9 @@ def list_details(request, prefix):
         raise Http404('Organisation list {} does not exist'.format(prefix))
     return render(request, 'list.html', context={'org_list': org_list, 'branch':use_branch})
 
-def _get_filename():
-    if git_commit_ref:
-        return git_commit_ref[:10]
+def _get_filename(use_branch='master'):
+    if git_commit_ref[use_branch]:
+        return git_commit_ref[use_branch][:10]
     else:
         return datetime.datetime.now().strftime("%Y%m%d%H%M%S")
 
@@ -540,7 +540,7 @@ def csv_download(request):
 
     response = HttpResponse(output.getvalue(), content_type='text/csv')
 
-    response['Content-Disposition'] = 'attachment; filename="org-id-{0}.csv"'.format(_get_filename())
+    response['Content-Disposition'] = 'attachment; filename="org-id-{0}.csv"'.format(_get_filename(use_branch))
     return response