mirror/django-mailbox
1
0
Fork 1
mirror of https://github.com/coddingtonbear/django-mailbox.git synced 2026-07-10 06:48:19 +02:00
Code Activity

fix utils.get_save_path

Browse source 
fix get_save_path in Migration
This commit is contained in:
Ilya Tleukenov 2020-01-31 15:44:51 +07:00
parent 2824cde5e9
commit 02acef8ede
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
django_mailbox/migrations/0005_auto_20160523_2240.py
View file

@ -12,6 +12,6 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='messageattachment', model_name='messageattachment',
name='document', name='document',
field=models.FileField(upload_to=django_mailbox.utils.get_attachment_save_path, verbose_name='Document'), field=models.FileField(upload_to=django_mailbox.utils.get_save_path(setting='attachment_upload_to'), verbose_name='Document'),
), ),
] ]

21
django_mailbox/utils.py
View file

@ -5,7 +5,6 @@ import os
from django.conf import settings from django.conf import settings
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -144,14 +143,16 @@ def get_body_from_message(message, maintype, subtype):
return body return body
def get_save_path(instance, filename, setting): def get_save_path(setting):
settings = get_settings() def _tmp(instance, filename):
settings = get_settings()
path = settings[setting] path = settings[setting]
if '%' in path: if '%' in path:
path = datetime.datetime.utcnow().strftime(path) path = datetime.datetime.utcnow().strftime(path)
return os.path.join( return os.path.join(
path, path,
filename, filename,
) )
return _tmp