Merge pull request #20 from overshard/master

Make ALLOW_UPLOADS a setting dependent on user preference and platform

babybuddy/settings/base.py

@@ -131,6 +131,8 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 
 WHITENOISE_ROOT = os.path.join(BASE_DIR, 'static', 'root')
 
+ALLOW_UPLOADS = True
+
 
 # Django Rest Framework
 # http://www.django-rest-framework.org/#

babybuddy/settings/development.py

@@ -10,6 +10,8 @@ INTERNAL_IPS = (
     '127.0.0.1',
 )
 
+ALLOW_UPLOADS = True
+
 
 # Database
 # https://docs.djangoproject.com/en/1.11/ref/settings/#databases

babybuddy/settings/eb.py

@@ -6,6 +6,9 @@ from .base import *  # noqa: F401,F403
 DEBUG = os.environ.get('DEBUG', False)
 
 
+ALLOW_UPLOADS = False
+
+
 # SECURITY WARNING: keep the secret key used in production secret!
 
 SECRET_KEY = os.environ['SECRET_KEY']

babybuddy/settings/heroku.py

@@ -8,6 +8,9 @@ from .base import *  # noqa: F401,F403
 DEBUG = os.environ.get('DEBUG', False)
 
 
+ALLOW_UPLOADS = False
+
+
 # SECURITY WARNING: keep the secret key used in production secret!
 
 SECRET_KEY = os.environ['SECRET_KEY']

babybuddy/settings/nanobox.py

@@ -6,6 +6,9 @@ from .base import *  # noqa: F401,F403
 DEBUG = os.environ.get('DEBUG', False)
 
 
+ALLOW_UPLOADS = False
+
+
 # SECURITY WARNING: keep the secret key used in production secret!
 
 SECRET_KEY = os.environ['SECRET_KEY']

core/admin.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.contrib import admin
+from django.conf import settings
 
 from core import models
 
@@ -10,7 +11,10 @@ from core import models
 class ChildAdmin(admin.ModelAdmin):
     list_display = ('first_name', 'last_name', 'birth_date', 'slug')
     list_filter = ('last_name',)
-    search_fields = ('first_name', 'last_name', 'birth_date',)
+    search_fields = ('first_name', 'last_name', 'birth_date')
+    fields = ['first_name', 'last_name', 'birth_date']
+    if settings.ALLOW_UPLOADS:
+        fields.append('picture')
 
 
 @admin.register(models.DiaperChange)

core/forms.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django import forms
 from django.utils import timezone
+from django.conf import settings
 
 from core import models
 
@@ -40,7 +41,13 @@ def set_default_duration(kwargs):
 class ChildForm(forms.ModelForm):
     class Meta:
         model = models.Child
-        fields = ['first_name', 'last_name', 'birth_date', 'picture']
+        fields = [
+            'first_name',
+            'last_name',
+            'birth_date'
+        ]
+        if settings.ALLOW_UPLOADS:
+            fields.append('picture')
         widgets = {
             'birth_date': forms.DateInput(attrs={
                 'class': 'datepicker-input',