From 59f93cd908c6eff9c7ddb9c82c3da9482ab89c51 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 24 Jun 2020 08:48:01 +0200 Subject: [PATCH 1/3] adding fail check on JSON getblogposts --- rowers/management/commands/getblogposts.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rowers/management/commands/getblogposts.py b/rowers/management/commands/getblogposts.py index 35dca13a..d6cb809e 100644 --- a/rowers/management/commands/getblogposts.py +++ b/rowers/management/commands/getblogposts.py @@ -7,6 +7,8 @@ import requests import datetime import arrow +from json.decoder import JSONDecodeError + PY3K = sys.version_info >= (3,0) from django.core.management.base import BaseCommand @@ -19,7 +21,10 @@ class Command(BaseCommand): response = requests.get( 'https://analytics.rowsandall.com/wp-json/wp/v2/posts?per_page=3') if response.status_code == 200: - blogs_json = response.json() + try: + blogs_json = response.json() + except JSONDecodeError: + blogs_json = [] else: blogs_json = [] except ConnectionError: @@ -46,4 +51,3 @@ class Command(BaseCommand): self.stdout.write(self.style.SUCCESS( 'Successfully processed blog posts')) - From 36c96964e6b75cca4468da5039f3ac9be53b3ae9 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 24 Jun 2020 08:48:17 +0200 Subject: [PATCH 2/3] fix --- rowers/management/commands/getblogposts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/management/commands/getblogposts.py b/rowers/management/commands/getblogposts.py index d6cb809e..3b23334b 100644 --- a/rowers/management/commands/getblogposts.py +++ b/rowers/management/commands/getblogposts.py @@ -7,7 +7,7 @@ import requests import datetime import arrow -from json.decoder import JSONDecodeError +from simplejson.errors import JSONDecodeError PY3K = sys.version_info >= (3,0) From 4344575bd4572479ccf5db5baf5058490a0e6ecc Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 24 Jun 2020 14:57:28 +0200 Subject: [PATCH 3/3] bug fix --- rowers/templates/virtualevent.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html index d27b0109..90d6bfed 100644 --- a/rowers/templates/virtualevent.html +++ b/rowers/templates/virtualevent.html @@ -276,9 +276,11 @@ {% endif %} + {% if race.manager == request.user %} + {% endif %}

@@ -430,7 +432,6 @@

- {% endif %} {% else %}

No results yet