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

Merge branch 'release/v7.22'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-07-08 11:55:02 +02:00
parent 3ad74201e5 8d3bcde04a
commit a98aba9fe9
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/sporttracksstuff.py
View File

@@ -218,7 +218,7 @@ def createsporttracksworkoutdata(w):
def getidfromresponse(response): def getidfromresponse(response):
t = response.json() t = response.json()
uri = t['uris'][0] uri = t['uris'][0]
regex = '.*?sporttracks\.mobi\/api\/v2\/fitnessActivity/(\d+)$' regex = '.*?sporttracks\.mobi\/api\/v2\/fitnessActivities/(\d+)\.json$'
m = re.compile(regex).match(uri).group(1) m = re.compile(regex).match(uri).group(1)
id = int(m) id = int(m)

2
rowers/tests.py
View File

@@ -300,7 +300,7 @@ def mocked_requests(*args, **kwargs):
if stuploadtester.match(args[0]): if stuploadtester.match(args[0]):
json_data = { json_data = {
"uris": [ "uris": [
"https://api.sporttracks.mobi/api/v2/fitnessActivity/123456" "https://api.sporttracks.mobi/api/v2/fitnessActivities/123456.json"
] ]
} }
return MockResponse(json_data, 200) return MockResponse(json_data, 200)

3
rowers/views.py
View File

@@ -1816,8 +1816,7 @@ def workout_sporttracks_upload_view(request,id=0):
r = w.user r = w.user
try: try:
res = sporttracks_open(r.user) thetoken = sporttracks_open(r.user)
thetoken = res[0]
except NoTokenError: except NoTokenError:
return HttpResponseRedirect("/rowers/me/sporttracksauthorize/") return HttpResponseRedirect("/rowers/me/sporttracksauthorize/")