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

Merge branch 'release/v18.6.25'

Browse Source
This commit is contained in:
Sander Roosendaal
2022-09-20 22:19:18 +02:00
parent 283bc3e501 4d349816a5
commit 23fb3f4f9e
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/tasks.py
View File

@@ -3548,7 +3548,7 @@ def fetch_strava_workout(stravatoken, oauth_data, stravaid, csvfilename, userid,
try: try:
if 'summary_polyline' in workoutsummary['map'] and workouttype == 'rower': # pragma: no cover if 'summary_polyline' in workoutsummary['map'] and workouttype == 'rower': # pragma: no cover
workouttype = 'water' workouttype = 'water'
except KeyError: # pragma: no cover except (KeyError,TypeError): # pragma: no cover
pass pass
try: try:

3
rowers/urls.py
View File

@@ -583,6 +583,9 @@ urlpatterns = [
re_path(r'^workout/(?P<pk>\b[0-9A-Fa-f]+\b)/delete/$', login_required( re_path(r'^workout/(?P<pk>\b[0-9A-Fa-f]+\b)/delete/$', login_required(
views.WorkoutDelete.as_view()), views.WorkoutDelete.as_view()),
name='workout_delete'), name='workout_delete'),
re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/delete/$', login_required(
views.WorkoutDelete.as_view()),
name='workout_delete'),
re_path(r'^strava/webhooks/', views.strava_webhook_view, re_path(r'^strava/webhooks/', views.strava_webhook_view,
name='strava_webhook_view'), name='strava_webhook_view'),
re_path(r'^garmin/summaries/', views.garmin_summaries_view, re_path(r'^garmin/summaries/', views.garmin_summaries_view,

5
rowers/views/workoutviews.py
View File

@@ -6737,7 +6737,10 @@ class WorkoutDelete(PermissionRequiredMixin, DeleteView):
return reverse('workouts_view') return reverse('workouts_view')
def get_object(self, *args, **kwargs): def get_object(self, *args, **kwargs):
workout_pk = self.kwargs['pk'] try:
workout_pk = self.kwargs['pk']
except KeyError:
workout_pk = self.kwargs['id']
try: try:
obj = Workout.objects.get(pk=workout_pk) obj = Workout.objects.get(pk=workout_pk)
except (ValueError, Workout.DoesNotExist): except (ValueError, Workout.DoesNotExist):