From 5036abc94e4435fdc6206965b18da6975eb50a86 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 25 Jul 2017 20:08:27 +0200 Subject: [PATCH 1/2] nothing --- rowsandall_app/settings.py | 2 +- rowsandall_app/settings_dev.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 0a81b4fe..b90e576a 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -139,7 +139,7 @@ DATABASES = { 'PASSWORD': CFG['db_password'], 'HOST': CFG['db_host'], 'PORT': CFG['db_port'], - }, + }, 'slave': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py index 69cbd074..f851d022 100644 --- a/rowsandall_app/settings_dev.py +++ b/rowsandall_app/settings_dev.py @@ -15,7 +15,7 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - 'HOST': 'localhost' + 'HOST': 'localhost', }, # 'TEST': { # 'CHARSET': 'utf8', From 851c0043da6fc9a6560aeca0f7af5f5cbc50226c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 25 Jul 2017 20:30:37 +0200 Subject: [PATCH 2/2] zip processing for team --- rowers/views.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rowers/views.py b/rowers/views.py index 7a3d0992..9d8493a5 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -7421,6 +7421,12 @@ def team_workout_upload_view(request,message="", url = reverse(team_workout_upload_view) response = HttpResponseRedirect(url) return response + elif id == -1: + message = 'The zip archive will be processed in the background. The files in the archive will only be uploaded without the extra actions. You will receive email when the workouts are ready.' + messages.info(request,message) + url = reverse(team_workout_upload_view) + response = HttpResponseRedirect(url) + return response else: successmessage = "The workout was added to the user's account"