Merge branch 'develop' into feature/workouteditor

rowers/views/importviews.py

@@ -1576,7 +1576,7 @@ def workout_c2import_view(request, page=1, userid=0, message=""):
     rower = getrequestrower(request, userid=userid)
     if rower.user != request.user:
         messages.error(
-            request, 'You can only access your own workouts on the NK Logbook, not those of your athletes')
+            request, 'You can only access your own workouts on the Concept2 Logbook, not those of your athletes')
         url = reverse('workout_c2import_view', kwargs={
                       'userid': request.user.id})
         return HttpResponseRedirect(url)

rowers/views/workoutviews.py

@@ -4593,6 +4593,7 @@ def workout_upload_api(request):
         message = {'status': 'false', 'message': 'invalid credentials'}
         return JSONResponse(status=403, data=message)
 
+
     form = DocumentsForm(post_data)
     optionsform = TeamUploadOptionsForm(post_data)
     rowerform = TeamInviteForm(post_data)
@@ -4613,6 +4614,7 @@ def workout_upload_api(request):
         message = {'status': 'false', 'message': 'could not find file'}
         return JSONResponse(status=400, data=message)
 
+
     # sync related IDs
     c2id = post_data.get('c2id', '')
 
@@ -4635,6 +4637,7 @@ def workout_upload_api(request):
 
     dologging('debuglog.log', s)
 
+
     r = None
     if form.is_valid():
         t = form.cleaned_data['title']
@@ -4768,6 +4771,7 @@ def workout_upload_api(request):
         message = form.errors
         return JSONResponse(status=400, data=message)
 
+
     message = {'status': 'true', 'id': w.id}
     statuscode = 200
     if fstr: