Merge branch 'develop' into feature/meal-planning

# Conflicts:
#	requirements.txt

cookbook/views/edit.py

@@ -1,4 +1,5 @@
 import os
+import uuid
 from io import BytesIO
 
 import simplejson
@@ -71,7 +72,7 @@ def internal_recipe_update(request, pk):
 
                 im_io = BytesIO()
                 img.save(im_io, 'PNG', quality=70)
-                recipe.image = File(im_io, name=(str(recipe.pk) + '.png'))
+                recipe.image = File(im_io, name=f'{uuid.uuid4()}_{recipe.pk}.png')
             elif 'image' in form.changed_data and form.cleaned_data['image'] is False:
                 recipe.image = None
 

cookbook/views/views.py

@@ -23,6 +23,8 @@ from cookbook.tables import RecipeTable, RecipeTableSmall, CookLogTable, ViewLog
 
 def index(request):
     if not request.user.is_authenticated:
+        if User.objects.count() < 1 and 'django.contrib.auth.backends.RemoteUserBackend' not in settings.AUTHENTICATION_BACKENDS:
+            return HttpResponseRedirect(reverse_lazy('view_setup'))
         return HttpResponseRedirect(reverse_lazy('view_search'))
     try:
         page_map = {
@@ -262,6 +264,12 @@ def history(request):
     return render(request, 'history.html', {'view_log': view_log, 'cook_log': cook_log})
 
 
+@group_required('admin')
+def system(request):
+    postgres = False if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql_psycopg2' else True
+    return render(request, 'system.html', {'gunicorn_media': settings.GUNICORN_MEDIA, 'debug': settings.DEBUG, 'postgres': postgres})
+
+
 def setup(request):
     if User.objects.count() > 0 or 'django.contrib.auth.backends.RemoteUserBackend' in settings.AUTHENTICATION_BACKENDS:
         messages.add_message(request, messages.ERROR, _('The setup page can only be used to create the first user! If you have forgotten your superuser credentials please consult the django documentation on how to reset passwords.'))