Merge branch 'develop' into feature/integrations

2023-02-11 13:50:00 +01:00
parent 792faf414e 27941d608c
commit da9998eaf1
2 changed files with 10 additions and 3 deletions
--- a/rowers/views/importviews.py
+++ b/rowers/views/importviews.py
@@ -692,7 +692,12 @@ def workout_nkimport_view(request, userid=0, after=0, before=0):
    parkedids = []
    try:
        with open('nkblocked.json', 'r') as nkblocked:
-            jsondata = json.load(nkblocked)
+            try:
+                jsondata = json.load(nkblocked)
+            except:
+                jsondata = {
+                    'ids':[]
+                }
            parkedids = jsondata['ids']
    except FileNotFoundError:  # pragma: no cover
        pass