Merge branch 'release/v18.6.24'

rowers/models.py

@@ -3552,9 +3552,9 @@ class Workout(models.Model):
                     boattype=boattype,
                     ownerfirst=ownerfirst,
                     ownerlast=ownerlast,
-                )
-            except ValueError:
-                stri = 'workout'
+                    )
+            except (ValueError, AttributeError):
+                stri = workout.name
 
         return stri
 

rowers/templates/list_workouts.html

@@ -121,7 +121,7 @@
               <a
               href={% url rower.defaultlandingpage id=workout.id|encode %}
               title="{{ rower.defaultlandingpage|verbose }}">
-              No Name 
+              No Name
               </a>
               {% endif %}
             </h3>
@@ -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 %}