Merge branch 'feature/deleteteams' into develop

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"

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'),

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',