Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Move variations to base model

Roland Geidera578d5aedf92
diff --git a/wger/exercises/migrations/0008_exercisebase.py b/wger/exercises/migrations/0008_exercisebase.py
index 6814ebe68..ac9c9fa32 100644
--- a/wger/exercises/migrations/0008_exercisebase.py
+++ b/wger/exercises/migrations/0008_exercisebase.py
@@ -41,6 +41,10 @@ class Migration(migrations.Migration):
related_name='secondary_muscles_base',
to='exercises.Muscle',
verbose_name='Secondary muscles')),
+ ('variations', models.ForeignKey(null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='exercises.variation',
+ verbose_name='Variations'))
],
options={
'abstract': False,
diff --git a/wger/exercises/migrations/0009_auto_20201211_0139.py b/wger/exercises/migrations/0009_auto_20201211_0139.py
index e1025f9e6..2cbda9e85 100644
--- a/wger/exercises/migrations/0009_auto_20201211_0139.py
+++ b/wger/exercises/migrations/0009_auto_20201211_0139.py
@@ -18,6 +18,7 @@ def copy_columns(apps, schema_editor):
exercise_base.license = exercise.license
exercise_base.license_author = exercise.license_author
exercise_base.license_author = exercise.license_author
+ exercise_base.variations = exercise.variations
exercise_base.save()
exercise.exercise_base = exercise_base
diff --git a/wger/exercises/migrations/0010_auto_20201211_0205.py b/wger/exercises/migrations/0010_auto_20201211_0205.py
index 54efa53c4..56054410b 100644
--- a/wger/exercises/migrations/0010_auto_20201211_0205.py
+++ b/wger/exercises/migrations/0010_auto_20201211_0205.py
@@ -26,4 +26,8 @@ class Migration(migrations.Migration):
model_name='exercise',
name='category',
),
+ migrations.RemoveField(
+ model_name='exercise',
+ name='variations',
+ ),
]
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 46af18bbf..26ab429cd 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -210,6 +210,13 @@ class ExerciseBase(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
blank=True)
"""Equipment needed by this exercise"""
+ variations = models.ForeignKey(Variation,
+ verbose_name=_('Variations'),
+ on_delete=models.CASCADE,
+ null=True,
+ blank=True)
+ """Variations of this exercise"""
+
class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
"""
@@ -250,16 +257,6 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
Globally unique ID, to identify the exercise across installations
"""
- # Added variation field
- variations = models.ForeignKey(
- Variation,
- verbose_name=_('Variations'),
- on_delete=models.CASCADE,
- null=True,
- blank=True
- )
- """Variations of this exercise"""
-
exercise_base = models.ForeignKey(ExerciseBase,
verbose_name='ExerciseBase',
on_delete=models.CASCADE,
@@ -330,8 +327,11 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
"""
Returns the variations for this exercise
"""
-
- return self.variations.exercise_set.exclude(id=self.id)
+ out = []
+ for variation in self.exercise_base.variations.exercisebase_set.all():
+ for exercise in variation.exercises.filter(language=self.language).accepted():
+ out.append(exercise)
+ return out
@property
def main_image(self):
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 1a927a697..f31593962 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -248,8 +248,8 @@ class ExercisesTestCase(WgerTestCase):
'license': 1,
'exercise_base': {
'category': 2,
- 'muscles': [1, 2]
- }})
+ 'muscles': [1, 2]}
+ })
count_after = Exercise.objects.count()
self.assertIn(response.status_code, STATUS_CODES_FAIL)