Merge branch 'develop' into feature/uploadpage

2017-05-09 08:42:40 +02:00
parent 358782fc0f 0fa374e9e7
commit faa8fa5316
3 changed files with 9 additions and 6 deletions
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -1183,10 +1183,10 @@ def workout_tp_upload_view(request,id=0):
    message = ""
    r = Rower.objects.get(user=request.user)
    res = -1
-    #    try:
-    thetoken = tp_open(r.user)
-    #    except TPNoTokenError:
-    #	return HttpResponseRedirect("/rowers/me/tpauthorize/")
+    try:
+        thetoken = tp_open(r.user)
+    except TPNoTokenError:
+        return HttpResponseRedirect("/rowers/me/tpauthorize/")

    # ready to upload. Hurray
    try: