Revert "Merge pull request #1280 from MarcusWolschon/feature1275_readable_export_file_names"
This reverts commitc4f40b9639
, reversing changes made to93b868bc69
.
This commit is contained in:
parent
7c5ffdaef4
commit
4af6de7425
@ -2,7 +2,6 @@ import json
|
|||||||
from io import BytesIO, StringIO
|
from io import BytesIO, StringIO
|
||||||
from re import match
|
from re import match
|
||||||
from zipfile import ZipFile
|
from zipfile import ZipFile
|
||||||
from django.utils.text import get_valid_filename
|
|
||||||
|
|
||||||
from rest_framework.renderers import JSONRenderer
|
from rest_framework.renderers import JSONRenderer
|
||||||
|
|
||||||
@ -57,8 +56,7 @@ class Default(Integration):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
recipe_zip_obj.close()
|
recipe_zip_obj.close()
|
||||||
|
export_zip_obj.writestr(str(r.pk) + '.zip', recipe_zip_stream.getvalue())
|
||||||
export_zip_obj.writestr(get_valid_filename(r.name) + '.zip', recipe_zip_stream.getvalue())
|
|
||||||
export_zip_obj.close()
|
export_zip_obj.close()
|
||||||
|
|
||||||
return [[ 'export.zip', export_zip_stream.getvalue() ]]
|
return [[ 'export.zip', export_zip_stream.getvalue() ]]
|
Loading…
Reference in New Issue
Block a user