Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix accessing workout sets

Roland Geider319cce2a3946
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 237a64732..886e90326 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -303,8 +303,8 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
delete_template_fragment_cache('equipment-overview', language.id)
# Cached workouts
- for set in self.set_set.all():
- reset_workout_canonical_form(set.exerciseday.training_id)
+ for setting in self.setting_set.all():
+ reset_workout_canonical_form(setting.set.exerciseday.training_id)
def delete(self, *args, **kwargs):
"""
@@ -318,8 +318,8 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
delete_template_fragment_cache('equipment-overview', language.id)
# Cached workouts
- for set in self.set_set.all():
- reset_workout_canonical_form(set.exerciseday.training.pk)
+ for setting in self.setting_set.all():
+ reset_workout_canonical_form(setting.set.exerciseday.training.pk)
super(Exercise, self).delete(*args, **kwargs)
@@ -576,8 +576,8 @@ class ExerciseComment(models.Model):
"""
Reset cached workouts
"""
- for set in self.exercise.set_set.all():
- reset_workout_canonical_form(set.exerciseday.training_id)
+ for setting in self.exercise.setting_set.all():
+ reset_workout_canonical_form(setting.set.exerciseday.training_id)
super(ExerciseComment, self).save(*args, **kwargs)
@@ -585,8 +585,8 @@ class ExerciseComment(models.Model):
"""
Reset cached workouts
"""
- for set in self.exercise.set_set.all():
- reset_workout_canonical_form(set.exerciseday.training.pk)
+ for setting in self.exercise.setting_set.all():
+ reset_workout_canonical_form(setting.set.exerciseday.training.pk)
super(ExerciseComment, self).delete(*args, **kwargs)
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 47c705ad0..6496ab119 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -665,9 +665,9 @@ class WorkoutCacheTestCase(WgerTestCase):
Tests the workout cache when saving
"""
exercise = Exercise.objects.get(pk=2)
- for set in exercise.set_set.all():
- set.exerciseday.training.canonical_representation
- workout_id = set.exerciseday.training_id
+ for setting in exercise.setting_set.all():
+ setting.set.exerciseday.training.canonical_representation
+ workout_id = setting.set.exerciseday.training_id
self.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))
exercise.save()
@@ -680,10 +680,10 @@ class WorkoutCacheTestCase(WgerTestCase):
exercise = Exercise.objects.get(pk=2)
workout_ids = []
- for set in exercise.set_set.all():
- workout_id = set.exerciseday.training_id
+ for setting in exercise.setting_set.all():
+ workout_id = setting.set.exerciseday.training_id
workout_ids.append(workout_id)
- set.exerciseday.training.canonical_representation
+ setting.set.exerciseday.training.canonical_representation
self.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))
exercise.delete()
diff --git a/wger/exercises/tests/test_exercise_comments.py b/wger/exercises/tests/test_exercise_comments.py
index 9922a5ff8..9009da56b 100644
--- a/wger/exercises/tests/test_exercise_comments.py
+++ b/wger/exercises/tests/test_exercise_comments.py
@@ -129,9 +129,9 @@ class WorkoutCacheTestCase(WgerTestCase):
Tests the workout cache when saving
"""
comment = ExerciseComment.objects.get(pk=1)
- for set in comment.exercise.set_set.all():
- set.exerciseday.training.canonical_representation
- workout_id = set.exerciseday.training_id
+ for setting in comment.exercise.setting_set.all():
+ setting.set.exerciseday.training.canonical_representation
+ workout_id = setting.set.exerciseday.training_id
self.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))
comment.save()
@@ -144,10 +144,10 @@ class WorkoutCacheTestCase(WgerTestCase):
comment = ExerciseComment.objects.get(pk=1)
workout_ids = []
- for set in comment.exercise.set_set.all():
- workout_id = set.exerciseday.training_id
+ for setting in comment.exercise.setting_set.all():
+ workout_id = setting.set.exerciseday.training_id
workout_ids.append(workout_id)
- set.exerciseday.training.canonical_representation
+ setting.set.exerciseday.training.canonical_representation
self.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))
comment.delete()