Merge branch 'dev' into 'master'

Dev

See merge request !69
master
Andrey 8 years ago
commit 25402592a3
  1. 2
      lms/settings.py
  2. 7
      storage/models.py

@ -60,6 +60,8 @@ YANDEX_MONEY_MAIL_ADMINS_ON_PAYMENT_ERROR = True
# место куда сохраняем пользовательские файлы
PERSONAL_FILES = '/personal_files/'
DATA_UPLOAD_MAX_MEMORY_SIZE = 115242880
DATABASES = {
'default': env.db(),
}

@ -10,9 +10,10 @@ class FileManager(models.Manager):
def upload_as_base64(self, file_base64):
if "data:" in file_base64:
my_str = file_base64[file_base64.index("base64,") + 7:]
ext = my_str.split('/')[-1]
file = self.create(original=ContentFile(base64.b64decode(my_str), name='time.' + ext))
my_str = file_base64[file_base64.index(";base64,")+8:]
content_type = file_base64[:file_base64.index(";base64,")].split('/')[1]
file_source = ContentFile(base64.b64decode(my_str), name='time.' + content_type)
file = self.create(original=file_source)
return file
raise ValueError()

Loading…
Cancel
Save