summaryrefslogtreecommitdiffstats
path: root/core/admin.py
diff options
context:
space:
mode:
authorSam Wenham <sam@wenhams.co.uk>2019-03-30 17:02:07 +0000
committerSam Wenham <sam@wenhams.co.uk>2019-03-30 17:02:07 +0000
commit64a4842dcbcbe10c5edb057c0000659f2809c1f9 (patch)
treea1ee35a80efb0e73ace1bc217de069760396e8f1 /core/admin.py
parenta4532a29da6c2a92553daeafbd3c7eca5b42f861 (diff)
downloadtroggle-64a4842dcbcbe10c5edb057c0000659f2809c1f9.tar.gz
troggle-64a4842dcbcbe10c5edb057c0000659f2809c1f9.tar.bz2
troggle-64a4842dcbcbe10c5edb057c0000659f2809c1f9.zip
Remove the redundant render_with_context() as django now does this just with the
render() shortcut Move from mimetype to content_type, missed in last commit
Diffstat (limited to 'core/admin.py')
-rw-r--r--core/admin.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/admin.py b/core/admin.py
index a8ce55f..59c93f2 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -74,11 +74,11 @@ class LogbookEntryAdmin(TroggleModelAdmin):
}
actions=('export_logbook_entries_as_html','export_logbook_entries_as_txt')
- def export_logbook_entries_as_html(modeladmin, request, queryset):
+ def export_logbook_entries_as_html(self, modeladmin, request, queryset):
response=downloadLogbook(request=request, queryset=queryset, extension='html')
return response
- def export_logbook_entries_as_txt(modeladmin, request, queryset):
+ def export_logbook_entries_as_txt(self, modeladmin, request, queryset):
response=downloadLogbook(request=request, queryset=queryset, extension='txt')
return response
@@ -141,14 +141,14 @@ admin.site.register(SurvexScanSingle)
def export_as_json(modeladmin, request, queryset):
- response = HttpResponse(mimetype="text/json")
+ response = HttpResponse(content_type="text/json")
response['Content-Disposition'] = 'attachment; filename=troggle_output.json'
serializers.serialize("json", queryset, stream=response)
return response
def export_as_xml(modeladmin, request, queryset):
- response = HttpResponse(mimetype="text/xml")
+ response = HttpResponse(content_type="text/xml")
response['Content-Disposition'] = 'attachment; filename=troggle_output.xml'
serializers.serialize("xml", queryset, stream=response)
return response