Merge 3749f2b into 2cd3aac

babybuddy · Dec 1, 2017 · d54ed49 · d54ed49
2 parents 2cd3aac + 3749f2b
commit d54ed49
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/babybuddy/settings/base.py b/babybuddy/settings/base.py
@@ -139,8 +139,6 @@
 
 WHITENOISE_ROOT = os.path.join(BASE_DIR, 'static', 'root')
 
-ALLOW_UPLOADS = os.environ.get('ALLOW_UPLOADS', True)
-
 
 # Django Rest Framework
 # http://www.django-rest-framework.org/#
@@ -165,5 +163,6 @@
 
 BABY_BUDDY = {
     'NAP_START_MIN': os.environ.get('NAP_START_MIN', '06:00'),
-    'NAP_START_MAX': os.environ.get('NAP_START_MAX', '18:00')
+    'NAP_START_MAX': os.environ.get('NAP_START_MAX', '18:00'),
+    'ALLOW_UPLOADS': os.environ.get('ALLOW_UPLOADS', True)
 }
diff --git a/babybuddy/settings/eb.py b/babybuddy/settings/eb.py
@@ -1,7 +1,7 @@
 from .base import *
 
 
-ALLOW_UPLOADS = os.environ.get('ALLOW_UPLOADS', False)
+BABY_BUDDY['ALLOW_UPLOADS'] = os.environ.get('ALLOW_UPLOADS', False)
 
 
 # Database

diff --git a/babybuddy/settings/heroku.py b/babybuddy/settings/heroku.py
@@ -3,7 +3,7 @@
 from .base import *
 
 
-ALLOW_UPLOADS = os.environ.get('ALLOW_UPLOADS', False)
+BABY_BUDDY['ALLOW_UPLOADS'] = os.environ.get('ALLOW_UPLOADS', False)
 
 
 # Database

diff --git a/core/admin.py b/core/admin.py
@@ -13,7 +13,7 @@ class ChildAdmin(admin.ModelAdmin):
     list_filter = ('last_name',)
     search_fields = ('first_name', 'last_name', 'birth_date')
     fields = ['first_name', 'last_name', 'birth_date']
-    if settings.ALLOW_UPLOADS:
+    if settings.BABY_BUDDY['ALLOW_UPLOADS']:
         fields.append('picture')
 
 

diff --git a/core/forms.py b/core/forms.py
@@ -46,7 +46,7 @@ class Meta:
             'last_name',
             'birth_date'
         ]
-        if settings.ALLOW_UPLOADS:
+        if settings.BABY_BUDDY['ALLOW_UPLOADS']:
             fields.append('picture')
         widgets = {
             'birth_date': forms.DateInput(attrs={