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

Merge branch 'release/v20.1.35'

Browse Source
This commit is contained in:
Sander Roosendaal
2023-09-27 21:28:26 +02:00
parent 42562f6a43 9eedf86dda
commit e6a19da7b1
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/dataroutines.py
View File

@@ -1005,6 +1005,7 @@ def parsenonpainsled(fileformat, f2, summary, startdatetime='', empowerfirmware=
try: try:
row = parsers[fileformat](f2) row = parsers[fileformat](f2)
except: except:
hasrecognized = False
return None, hasrecognized, '', 'unknown' return None, hasrecognized, '', 'unknown'
if startdatetime != '': # pragma: no cover if startdatetime != '': # pragma: no cover
row.rowdatetime = arrow.get(startdatetime).datetime row.rowdatetime = arrow.get(startdatetime).datetime

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

Binary file not shown.

7
rowers/views/importviews.py
View File

@@ -524,7 +524,12 @@ def rower_process_stravacallback(request):
r.stravarefreshtoken = refresh_token r.stravarefreshtoken = refresh_token
r.save() r.save()
_ = strava_integration.set_strava_athlete_id() try:
_ = strava_integration.set_strava_athlete_id()
except NoTokenError:
messages.error(request,'Something went wrong storing your Strava ID. Please authorize again')
url = reverse('rower_exportsettings_view')
return HttpResponseRedirect(url)
successmessage = "Tokens stored. Good to go. Please check your import/export settings" successmessage = "Tokens stored. Good to go. Please check your import/export settings"
messages.info(request, successmessage) messages.info(request, successmessage)