Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Make workout detail page work again

Roland Geider663fca94e186
diff --git a/wger/core/templates/tags/render_day.html b/wger/core/templates/tags/render_day.html
index 9de0e5c70..e4500b5d4 100644
--- a/wger/core/templates/tags/render_day.html
+++ b/wger/core/templates/tags/render_day.html
@@ -56,26 +56,26 @@
</tr>
</thead>
<tbody>
- {% for set_data in day.sets %}
- <tr data-id="{{ set_data.set.id }}" id="set-{{ set_data.set.id }}">
+ {% for set in day.set_set.select_related.all %}
+ <tr data-id="{{ set.id }}" id="set-{{ set.id }}">
<td style="width: 15%;border-right-width: 0;">
<span>#{{ forloop.counter }}</span>
{% if editable %}
<div class="dropdown float-right">
<button class="btn btn-link btn-sm btn-block dropdown-toggle " type="button"
- id="dropdownMenuSet{{ set_data.set.id }}" data-toggle="dropdown"
+ id="dropdownMenuSet{{ set.id }}" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
</button>
<div class="dropdown-menu dropdown-menu-right"
- aria-labelledby="dropdownMenuSet{{ set_data.set.id }}">
- <a href="{% url 'manager:set:edit' set_data.set.id %}"
+ aria-labelledby="dropdownMenuSet{{ set.id }}">
+ <a href="{% url 'manager:set:edit' set.id %}"
class="wger-modal-dialog dropdown-item">
<span class="{% fa_class 'edit' %}"></span>
{% translate 'Edit' %}
</a>
<div class="dropdown-divider"></div>
- <a href="{% url 'manager:set:delete' set_data.set.id %}"
+ <a href="{% url 'manager:set:delete' set.id %}"
class="dropdown-item">
<span class="{% fa_class 'trash' %}"></span>
{% translate 'Delete' %}
@@ -92,21 +92,21 @@
{% endif %}
</td>
<td style="border-left-width: 0px;">
- {% if set_data.set.comment %}
- <p class="text-muted">{{ set_data.set.comment }}</p>
+ {% if set.comment %}
+ <p class="text-muted">{{ set.comment }}</p>
{% endif %}
<div class="exercise-list">
- {% for exercise_data in set_data.exercises %}
- <div id="exercise-{{ exercise_data.exercise.id }}" class="ajax-set-edit-target">
+ {% for exercise in set.exercises %}
+ <div id="exercise-{{ exercise.id }}" class="ajax-set-edit-target">
<div class="media">
<div style="width: 64px; height: 64px;">
- <a href="{{ exercise_data.exercise.get_absolute_url }}">
- {% if exercise_data.main_image %}
+ <a href="{{ exercise.get_absolute_url }}">
+ {% if exercise.main_image %}
<img class="img-fluid"
- src="{{ exercise_data.main_image.image|thumbnail_url:'small' }}"
- alt="{{ exercise_data }}"
+ src="{{ exercise.main_image.image|thumbnail_url:'small' }}"
+ alt="{{ exercise }}"
style="max-width: 100%; max-height: 100%;">
{% else %}
<img class="img-fluid"
@@ -119,26 +119,26 @@
<div class="media-body ml-2">
<p class="media-heading h5">
- {{ exercise_data.exercise.name }}
+ {{ exercise.name }}
</p>
<p>
- {{ exercise_data.setting_text }}
+ {{ exercise.settings }}
</p>
{% if editable %}
- {% if not exercise_data.settings %}
+ {% if not exercise.settings %}
<p>
{% translate "This exercise has no repetitions." %}<br>
- <a href="{% url 'manager:set:edit' set_data.set.id %}"
+ <a href="{% url 'manager:set:edit' set.id %}"
class="wger-modal-dialog">
{% translate "Edit them now." %}
</a>
</p>
{% endif %}
- {% if exercise_data.exercise.comment_set.all %}
+ {% if exercise.exercisecomment_set.all %}
<p class="text-muted exercise-comments">
- {% for comment in exercise_data.exercise.comment_set.all %}
+ {% for comment in exercise.exercisecomment_set.all %}
{{ comment }}<br>
{% endfor %}
</p>
diff --git a/wger/manager/models/set.py b/wger/manager/models/set.py
index a2b06fced..845c4546e 100644
--- a/wger/manager/models/set.py
+++ b/wger/manager/models/set.py
@@ -96,7 +96,11 @@ class Set(models.Model):
@property
def exercises(self) -> typing.List[Exercise]:
"""Returns the exercises for this set"""
- return list(dict.fromkeys([s.exercise for s in self.setting_set.all()]))
+ out = list(dict.fromkeys([s.exercise for s in self.setting_set.select_related().all()]))
+ for exercise in out:
+ exercise.settings = self.reps_smart_text(exercise)
+
+ return out
@property
def compute_settings(self): # -> typing.List[Setting]:
@@ -213,7 +217,7 @@ class Set(models.Model):
return out
- settings = self.setting_set.filter(exercise=exercise)
+ settings = self.setting_set.select_related().filter(exercise=exercise)
setting_text = ''
# Only one setting entry, this is a "compact" representation such as e.g.