Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

added get_variations property, modified get_variation(), and changed template

ryowrightd6c1ee71e41f
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index be9471fe1..1c787e992 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -170,6 +170,9 @@ class Variation(models.Model):
"""
return False
+ def get_variation(self):
+ return f'Variation {self.id}'
+
class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
"""
@@ -296,6 +299,10 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
# Own methods
#
+ @property
+ def get_variations(self):
+ return self.variations.exercise_set.exclude(id=self.id)
+
@property
def main_image(self):
"""
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index e6ceec8ef..38a7a72de 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -256,7 +256,7 @@ $(document).ready(function() {
{% if exercise.variations %}
<h5 class="mt-4">{% trans "Exercise Variations" %}:</h5>
<ul>
- {% for variation in variations %}
+ {% for variation in exercise.get_variations %}
<li>
<a href="{{ variation.get_absolute_url }}">{{ variation }}</a>
</li>
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 67ad2cf2b..64c7aacae 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -133,11 +133,8 @@ def view(request, id, slug=None):
template_data['show_shariff'] = True
exercise = get_object_or_404(Exercise, pk=id)
- variations = Exercise.objects.select_related().filter(
- variations=exercise.variations).exclude(name=exercise.name)
template_data['exercise'] = exercise
- template_data['variations'] = variations
template_data["muscles_main_front"] = exercise.muscles.filter(is_front=True)
template_data["muscles_main_back"] = exercise.muscles.filter(is_front=False)