sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-25 18:32:39 +01:00
parent adc74360cb 8b46d8a1e4
commit 65ccd8b0cb
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowsandall_app/settings.py
View File

@@ -221,11 +221,11 @@ LANGUAGE_COOKIE_NAME = 'wm_lang'
# https://docs.djangoproject.com/en/1.9/howto/static-files/ # https://docs.djangoproject.com/en/1.9/howto/static-files/
STATIC_URL = '/static/' STATIC_URL = '/static/'
STATIC_ROOT = BASE_DIR #STATIC_ROOT = BASE_DIR
#STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'), STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static/plots'),]
os.path.join(BASE_DIR, 'static/plots'),] # os.path.join(BASE_DIR, 'static'),
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_ROOT = os.path.join(BASE_DIR, 'media')

2
rowsandall_app/settings_dev.py
View File

@@ -78,6 +78,7 @@ CACHES = {
STATIC_URL = '/static/' STATIC_URL = '/static/'
#STATIC_ROOT = 'C:/python/rowsandallapp' #STATIC_ROOT = 'C:/python/rowsandallapp'
STATIC_ROOT = BASE_DIR
INTERNAL_IPS = ['127.0.0.1'] INTERNAL_IPS = ['127.0.0.1']
@@ -108,4 +109,3 @@ EMAIL_USE_TLS = CFG['email_use_tls']
DEFAULT_FROM_EMAIL = 'info@rowsandall.com' DEFAULT_FROM_EMAIL = 'info@rowsandall.com'
SETTINGS_NAME = 'rowsandall_app.settings_dev' SETTINGS_NAME = 'rowsandall_app.settings_dev'