From 64a4842dcbcbe10c5edb057c0000659f2809c1f9 Mon Sep 17 00:00:00 2001 From: Sam Wenham Date: Sat, 30 Mar 2019 17:02:07 +0000 Subject: 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 --- core/admin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/admin.py') 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 -- cgit v1.2.3