From d8851e4199c53a1139f354e747a1ddd3e176cb1b Mon Sep 17 00:00:00 2001 From: Mikhail Bortnikov Date: Thu, 13 Jul 2017 19:03:07 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D1=83=D1=82=D1=8C=20=D0=B4=D0=BE=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- storage/files_api.py | 2 +- storage/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/files_api.py b/storage/files_api.py index ce520a1..6a721cf 100755 --- a/storage/files_api.py +++ b/storage/files_api.py @@ -8,7 +8,7 @@ from lms.decors import api_decor from lms.tools import translit from storage.models import Storage, CroppedImage, FormatIndex -IMAGE_TMP = settings.MEDIA_ROOT + 'tmp/' +IMAGE_TMP = settings.MEDIA_ROOT + '/personal_files/' def save_gif(pil_img, path): diff --git a/storage/models.py b/storage/models.py index 839a8c4..6502b72 100755 --- a/storage/models.py +++ b/storage/models.py @@ -137,7 +137,7 @@ class CroppedImage(models.Model): verbose_name_plural = u'Картинки' -IMAGE_TMP = settings.MEDIA_ROOT + 'tmp/' +IMAGE_TMP = settings.MEDIA_ROOT + '/personal_files/' def save_resize_image(filename, pil_img, save_field, file_format): From 925a0544508b96caefad6f70e8f4d984b846e009 Mon Sep 17 00:00:00 2001 From: Mikhail Bortnikov Date: Thu, 20 Jul 2017 18:36:11 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=20=D0=BF?= =?UTF-8?q?=D1=83=D1=82=D1=8C=20=D0=B2=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- storage/files_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/files_api.py b/storage/files_api.py index 6a721cf..a7accea 100755 --- a/storage/files_api.py +++ b/storage/files_api.py @@ -8,7 +8,7 @@ from lms.decors import api_decor from lms.tools import translit from storage.models import Storage, CroppedImage, FormatIndex -IMAGE_TMP = settings.MEDIA_ROOT + '/personal_files/' +IMAGE_TMP = settings.MEDIA_ROOT + settings.PERSONAL_FILES def save_gif(pil_img, path): From 1d076335b8e974b16d819399708dbab8f463be0c Mon Sep 17 00:00:00 2001 From: Mikhail Bortnikov Date: Fri, 21 Jul 2017 12:51:11 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e858c2..3664577 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ # This file is a template, and might need editing before it works on your project. # Official docker image. -#image: docker:latest -#services: -# - docker:dind +image: docker:latest +services: + - docker:dind variables: CHANNEL: "skillbox" SERVER_URL: "lms.test.spicycms.com" From 205e774ef8f3b42c580214b778da992d2b92b597 Mon Sep 17 00:00:00 2001 From: Mikhail Bortnikov Date: Mon, 24 Jul 2017 17:56:22 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=BF=D1=83=D1=82=D1=8C=20=D0=B2=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/settings.py | 4 ++++ storage/models.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lms/settings.py b/lms/settings.py index e360867..4e062db 100644 --- a/lms/settings.py +++ b/lms/settings.py @@ -65,6 +65,10 @@ YANDEX_SHOP_ID = '84348' YANDEX_scid = '78309' # Application definition +# место куда сохраняем пользовательские файлы +PERSONAL_FILES = '/personal_files/' + + INSTALLED_APPS = [ #'jet.dashboard', #'jet', diff --git a/storage/models.py b/storage/models.py index 6502b72..2685ea6 100755 --- a/storage/models.py +++ b/storage/models.py @@ -137,7 +137,7 @@ class CroppedImage(models.Model): verbose_name_plural = u'Картинки' -IMAGE_TMP = settings.MEDIA_ROOT + '/personal_files/' +IMAGE_TMP = settings.MEDIA_ROOT + settings.PERSONAL_FILES def save_resize_image(filename, pil_img, save_field, file_format):