From 27c7a172a02e8e0e320341d28353963fda166a65 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 14 Dec 2019 10:36:40 +0100 Subject: [PATCH 1/2] removed temp gauge --- rowers/templates/embedded_video.html | 2 -- rowsandall_app/settings.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/rowers/templates/embedded_video.html b/rowers/templates/embedded_video.html index 69641929..480dad9d 100644 --- a/rowers/templates/embedded_video.html +++ b/rowers/templates/embedded_video.html @@ -692,8 +692,6 @@ dataplay.onclick = function() { }); - - {% endlanguage %} {% endblock %} diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index a916a5f2..2df72fc8 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -84,7 +84,7 @@ MIDDLEWARE = [ 'django.middleware.common.CommonMiddleware', 'django.middleware.common.BrokenLinkEmailsMiddleware', 'django.middleware.gzip.GZipMiddleware', - 'htmlmin.middleware.HtmlMinifyMiddleware', +# 'htmlmin.middleware.HtmlMinifyMiddleware', # 'htmlmin.middleware.MarkRequestMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.security.SecurityMiddleware', From e24dd0742679880062e184e0c4c272e6a698fcdf Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 14 Dec 2019 14:34:58 +0100 Subject: [PATCH 2/2] bug fix --- rowers/views/workoutviews.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 457c6260..befac25e 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -5171,12 +5171,11 @@ def workout_split_view(request,id=0): ids,mesgs = dataprep.split_workout( r,row,splitsecond,splitmode ) + for message in mesgs: + messages.info(request,message) except IndexError: messages.error(request,"Something went wrong in Split") - for message in mesgs: - messages.info(request,message) - if request.user == r: url = reverse('workouts_view')