Merge branch 'release/v18.6.24'

2022-09-20 21:46:54 +02:00
parent 1ebe0d0581 f725be8892
commit 283bc3e501
2 changed files with 5 additions and 5 deletions
@@ -3553,8 +3553,8 @@ class Workout(models.Model):
                    ownerfirst=ownerfirst,
                    ownerlast=ownerlast,
                    )
-            except ValueError:
-                stri = 'workout'
+            except (ValueError, AttributeError):
+                stri = workout.name

        return stri

@@ -160,7 +160,7 @@
            <i class="{{ rower.defaultlandingpage2|landingicon }}"></i></a>
            {% else %}
            <a class="small"
-            href={% url rower.defaultlandingpage2 pk=workout.id|encode %}
+            href={% url rower.defaultlandingpage2 id=workout.id|encode %}
            title="{{ rower.defaultlandingpage2|verbose }}">
            <i class="{{ rower.defaultlandingpage2|landingicon }}"></i></a>
            {% endif %}