sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v9.46'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-03-10 19:13:02 +01:00
parent 374c4978b1 5a712b4f81
commit f2d4abe487
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/middleware.py
View File

@@ -5,6 +5,7 @@ import datetime
from rowers.utils import myqueue from rowers.utils import myqueue
import django_rq import django_rq
queue = django_rq.get_queue('default') queue = django_rq.get_queue('default')
queuelow = django_rq.get_queue('low')
from rowers.tasks import handle_updatefitnessmetric,handle_sendemail_expired from rowers.tasks import handle_updatefitnessmetric,handle_sendemail_expired
from rowers.mytypes import otwtypes from rowers.mytypes import otwtypes
from django.contrib import messages from django.contrib import messages
@@ -59,7 +60,7 @@ def do_update(user,mode='rower',days=42):
if last_update_date < now_date and max_workout_id < max_id: if last_update_date < now_date and max_workout_id < max_id:
job = myqueue(queue, job = myqueue(queuelow,
handle_updatefitnessmetric, handle_updatefitnessmetric,
user.id,mode,theids, user.id,mode,theids,
) )

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

12
rowers/views/importviews.py
View File

@@ -407,7 +407,7 @@ def rower_c2_authorize(request):
params = {"client_id": C2_CLIENT_ID, params = {"client_id": C2_CLIENT_ID,
"response_type": "code", "response_type": "code",
"redirect_uri": C2_REDIRECT_URI} "redirect_uri": C2_REDIRECT_URI}
url = "http://log.concept2.com/oauth/authorize?"+ urllib.urlencode(params) url = "http://log.concept2.com/oauth/authorize?"+ urllib.parse.urlencode(params)
url += "&scope="+scope url += "&scope="+scope
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -424,7 +424,7 @@ def rower_strava_authorize(request):
"redirect_uri": STRAVA_REDIRECT_URI, "redirect_uri": STRAVA_REDIRECT_URI,
"scope": "activity:write,activity:read_all"} "scope": "activity:write,activity:read_all"}
url = "https://www.strava.com/oauth/authorize?"+ urllib.urlencode(params) url = "https://www.strava.com/oauth/authorize?"+ urllib.parse.urlencode(params)
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -440,7 +440,7 @@ def rower_polar_authorize(request):
"state": state, "state": state,
# "scope":"accesslink.read_all" # "scope":"accesslink.read_all"
} }
url = "https://flow.polar.com/oauth2/authorization?" +urllib.urlencode(params) url = "https://flow.polar.com/oauth2/authorization?" +urllib.parse.urlencode(params)
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -459,7 +459,7 @@ def rower_runkeeper_authorize(request):
"state": state, "state": state,
"redirect_uri": RUNKEEPER_REDIRECT_URI} "redirect_uri": RUNKEEPER_REDIRECT_URI}
url = "https://runkeeper.com/apps/authorize?"+ urllib.urlencode(params) url = "https://runkeeper.com/apps/authorize?"+ urllib.parse.urlencode(params)
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -477,7 +477,7 @@ def rower_sporttracks_authorize(request):
"state": state, "state": state,
"redirect_uri": SPORTTRACKS_REDIRECT_URI} "redirect_uri": SPORTTRACKS_REDIRECT_URI}
url = "https://api.sporttracks.mobi/oauth2/authorize?"+ urllib.urlencode(params) url = "https://api.sporttracks.mobi/oauth2/authorize?"+ urllib.parse.urlencode(params)
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -511,7 +511,7 @@ def rower_tp_authorize(request):
"redirect_uri": TP_REDIRECT_URI, "redirect_uri": TP_REDIRECT_URI,
"scope": "file:write", "scope": "file:write",
} }
url = "https://oauth.trainingpeaks.com/oauth/authorize/?" +urllib.urlencode(params) url = "https://oauth.trainingpeaks.com/oauth/authorize/?" +urllib.parse.urlencode(params)
return HttpResponseRedirect(url) return HttpResponseRedirect(url)