bug fix

rowers/urls.py

@@ -117,7 +117,7 @@ urlpatterns = [
     url(r'^404/$', TemplateView.as_view(template_name='404.html'),name='404'),
     url(r'^400/$', TemplateView.as_view(template_name='400.html'),name='400'),
     url(r'^403/$', TemplateView.as_view(template_name='403.html'),name='403'),
-    url(r'^imports/$', views.imports_view),
+#    url(r'^imports/$', views.imports_view),
     url(r'^exportallworkouts/?$',views.workouts_summaries_email_view),
     url(r'^update_empower$',views.rower_update_empower_view),
     url(r'^agegroupcp/(?P<age>\d+)$',views.agegroupcpview),

rowers/views.py

@@ -1662,7 +1662,8 @@ def workout_strava_upload_view(request,id=0):
 		                os.remove(tcxfile)
                             except WindowsError:
                                 pass
-		            url = "/rowers/workout/"+str(w.id)+"/edit"
+                            url = reverse(workout_edit_view,kwargs={'id':w.id})
+
 
                             messages.info(request,mes)
 	                except:
@@ -1778,7 +1779,8 @@ def workout_runkeeper_upload_view(request,id=0):
 	    runkeeperid = runkeeperstuff.getidfromresponse(response)
 	    w.uploadedtorunkeeper = runkeeperid
 	    w.save()
-	    url = "/rowers/workout/"+str(w.id)+"/export"
+            url = reverse(workout_edut_view, kwargs={'id':w.id})
+
 	    return HttpResponseRedirect(url)
 	else:
 	    s = response
@@ -1842,7 +1844,8 @@ def workout_underarmour_upload_view(request,id=0):
 	    underarmourid = underarmourstuff.getidfromresponse(response)
 	    w.uploadedtounderarmour = underarmourid
 	    w.save()
-	    url = "/rowers/workout/"+str(w.id)+"/export"
+            url = reverse(workout_edit_view,kwargs={'id':w.id})
+
 	    return HttpResponseRedirect(url)
 	else:
 	    s = response
@@ -1907,7 +1910,8 @@ def workout_sporttracks_upload_view(request,id=0):
 	    w.save()
             message = "Upload to SportTracks was successful"
             messages.info(request,message)
-	    url = "/rowers/workout/"+str(w.id)+"/export"
+
+            url = reverse(workout_edit_view,kwargs={'id':w.id})
 	    return HttpResponseRedirect(url)
 	else:
 	    s = response
@@ -2068,7 +2072,10 @@ def rower_c2_token_refresh(request):
         message = "Something went wrong (refreshing tokens). Please reauthorize:"
         messages.error(request,message)
 
-    return imports_view(request)
+    url = reverse(workouts_view)
+
+    return HttpResponseRedirect(url)
+
 
 # Underarmour token refresh. URL for manual refresh. Not visible to users
 @login_required()
@@ -2092,7 +2099,11 @@ def rower_underarmour_token_refresh(request):
 
     successmessage = "Tokens refreshed. Good to go"
     messages.info(request,successmessage)
-    return imports_view(request)
+
+    url = reverse(workouts_view)
+
+    return HttpResponseRedirect(url)
+
 
 
 # TrainingPeaks token refresh. URL for manual refresh. Not visible to users
@@ -2116,7 +2127,12 @@ def rower_tp_token_refresh(request):
 
     successmessage = "Tokens refreshed. Good to go"
     messages.info(request,successmessage)
-    return imports_view(request)
+
+    url = reverse(workouts_view)
+
+    return HttpResponseRedirect(url)
+
+
 
 
 # SportTracks token refresh. URL for manual refresh. Not visible to users
@@ -2140,7 +2156,11 @@ def rower_sporttracks_token_refresh(request):
 
     successmessage = "Tokens refreshed. Good to go"
     messages.info(request,successmessage)
-    return imports_view(request)
+
+    url = reverse(workouts_view)
+
+    return HttpResponseRedirect(url)
+
 
 
 # Concept2 Callback
@@ -2152,14 +2172,21 @@ def rower_process_callback(request):
     except MultiValueDictKeyError:
 	message = "The resource owner or authorization server denied the request"
         messages.error(request,message)
-	return imports_view(request)
+
+        url = reverse(workouts_view)
+
+        return HttpResponseRedirect(url)
 	
     access_token = res[0]
     if access_token == 0:
         message = res[1]
         message += ' Contact info@rowsandall.com if this behavior persists.'
         messages.error(request,message)
-        return imports_view(request)
+
+        url = reverse(workouts_view)
+
+        return HttpResponseRedirect(url)
+	
         
     expires_in = res[1]
     refresh_token = res[2]
@@ -2174,7 +2201,11 @@ def rower_process_callback(request):
 
     successmessage = "Tokens stored. Good to go"
     messages.info(request,successmessage)
-    return imports_view(request)
+
+    url = reverse(workouts_view)
+    
+    return HttpResponseRedirect(url)
+
 
 # The imports page
 @login_required()
@@ -2208,7 +2239,10 @@ def imports_view(request):
 def test_reverse_view(request):
     successmessage = "Tokens stored. Good to go"
     messages.info(request,successmessage)
-    return imports_view(request)
+
+    url = reverse(workouts_view)
+    
+    return HttpResponseRedirect(url)
 
 # dummy 
 @login_required()
@@ -2227,7 +2261,11 @@ def rower_process_polarcallback(request):
             message = "access error"
 
         messages.error(request,message)
-        return imports_view(request)
+        url = reverse(workouts_view)
+        
+        return HttpResponseRedirect(url)
+
+
 
     access_token, expires_in, user_id = polarstuff.get_token(code)
 
@@ -2242,7 +2280,11 @@ def rower_process_polarcallback(request):
 
     successmessage = "Tokens stored. Good to go"
     messages.info(request,successmessage)
-    return imports_view(request)
+    url = reverse(workouts_view)
+        
+    return HttpResponseRedirect(url)
+
+
 
 
 # Process Strava Callback
@@ -2257,7 +2299,10 @@ def rower_process_stravacallback(request):
             message = "access error"
 
         messages.error(request,message)
-        return imports_view(request)
+        url = reverse(workouts_view)
+        
+        return HttpResponseRedirect(url)
+
             
     res = stravastuff.get_token(code)
 
@@ -2275,7 +2320,10 @@ def rower_process_stravacallback(request):
     else:
         message = "Something went wrong with the Strava authorization"
         messages.error(request,message)
-        return imports_view(request)
+        url = reverse(workouts_view)
+        
+        return HttpResponseRedirect(url)
+
 
 # Process Runkeeper callback
 @login_required()
@@ -2286,7 +2334,11 @@ def rower_process_runkeepercallback(request):
 
     if access_token == 0:
         messages.error(request,"Something went wrong importing the token")
-        return imports_view(request)
+        url = reverse(workouts_view)
+        
+        return HttpResponseRedirect(url)
+
+
 
     r = getrower(request.user)
     r.runkeepertoken = access_token
@@ -2295,7 +2347,11 @@ def rower_process_runkeepercallback(request):
 
     successmessage = "Tokens stored. Good to go"
     messages.info(request,successmessage)
-    return imports_view(request)
+    url = reverse(workouts_view)
+        
+    return HttpResponseRedirect(url)
+
+
 
 # Process SportTracks callback
 @login_required()
@@ -2319,7 +2375,11 @@ def rower_process_sporttrackscallback(request):
 
     successmessage = "Tokens stored. Good to go"
     messages.info(request,successmessage)
-    return imports_view(request)
+    url = reverse(workouts_view)
+        
+    return HttpResponseRedirect(url)
+
+
 
 # Process Underarmour callback
 @login_required()
@@ -2342,7 +2402,11 @@ def rower_process_underarmourcallback(request):
 
     successmessage = "Tokens stored. Good to go"
     messages.info(request,successmessage)
-    return imports_view(request)
+    url = reverse(workouts_view)
+        
+    return HttpResponseRedirect(url)
+
+
 
 # Process TrainingPeaks callback
 @login_required()
@@ -2364,7 +2428,11 @@ def rower_process_tpcallback(request):
 
     successmessage = "Tokens stored. Good to go"
     messages.info(request,successmessage)
-    return imports_view(request)
+    url = reverse(workouts_view)
+        
+    return HttpResponseRedirect(url)
+
+
 
 # Process Own API callback - for API testing purposes
 @login_required()
@@ -10099,7 +10167,7 @@ def workout_polarimport_view(request,userid=0):
         a = exercises.status_code
         if a == 401:
             messages.error(request,'Not authorized. You need to connect to Polar first')
-        url = reverse(imports_view)
+        url = reverse(workouts_view)
         return HttpResponseRedirect(url)
     except:
         pass
@@ -10381,7 +10449,10 @@ def workout_getimportview(request,externalid,source = 'c2'):
     res = importsources[source].get_workout(request.user,externalid)
     if not res[0]:
         messages.error(request,res[1])
-        return imports_view(request)
+        url = reverse(workouts_view)
+        
+        return HttpResponseRedirect(url)
+
 
     strokedata = res[1]
     data = res[0]