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

Merge branch 'release/v18.6.24'

Browse Source
This commit is contained in:
Sander Roosendaal
2022-09-20 21:46:54 +02:00
parent 1ebe0d0581 f725be8892
commit 283bc3e501
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/models.py
+3 -3
View File
@@ -3552,9 +3552,9 @@ class Workout(models.Model):
boattype=boattype, boattype=boattype,
ownerfirst=ownerfirst, ownerfirst=ownerfirst,
ownerlast=ownerlast, ownerlast=ownerlast,
) )
except ValueError: except (ValueError, AttributeError):
stri = 'workout' stri = workout.name
return stri return stri
rowers/templates/list_workouts.html
+1 -1
View File
@@ -160,7 +160,7 @@
<i class="{{ rower.defaultlandingpage2|landingicon }}"></i></a> <i class="{{ rower.defaultlandingpage2|landingicon }}"></i></a>
{% else %} {% else %}
<a class="small" <a class="small"
href={% url rower.defaultlandingpage2 pk=workout.id|encode %} href={% url rower.defaultlandingpage2 id=workout.id|encode %}
title="{{ rower.defaultlandingpage2|verbose }}"> title="{{ rower.defaultlandingpage2|verbose }}">
<i class="{{ rower.defaultlandingpage2|landingicon }}"></i></a> <i class="{{ rower.defaultlandingpage2|landingicon }}"></i></a>
{% endif %} {% endif %}