Merge branch 'TandoorRecipes-develop' into develop
This commit is contained in:
commit
f8c744e301
@ -2,6 +2,7 @@ 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
|
||||||
|
|
||||||
@ -58,12 +59,14 @@ 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())
|
||||||
|
|
||||||
el.exported_recipes += 1
|
el.exported_recipes += 1
|
||||||
el.msg += self.get_recipe_processed_msg(r)
|
el.msg += self.get_recipe_processed_msg(r)
|
||||||
el.save()
|
el.save()
|
||||||
|
|
||||||
|
|
||||||
export_zip_obj.close()
|
export_zip_obj.close()
|
||||||
|
|
||||||
return [[ self.get_export_file_name(), export_zip_stream.getvalue() ]]
|
return [[ self.get_export_file_name(), export_zip_stream.getvalue() ]]
|
Loading…
Reference in New Issue
Block a user