Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Rename FK exercise to exercise base in images

Roland Geider2999da4ce8b4
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 31a931e7e..05234b539 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -62,7 +62,7 @@ class ExerciseImageSerializer(serializers.ModelSerializer):
model = ExerciseImage
fields = ['id',
'uuid',
- 'exercise',
+ 'exercise_base',
'image',
'is_main',
'status']
@@ -120,6 +120,7 @@ class ExerciseSerializer(serializers.ModelSerializer):
fields = ("id",
"uuid",
"name",
+ "exercise_base",
"status",
"description",
"creation_date",
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 64cd61a6f..2d88a028f 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -88,6 +88,7 @@ class ExerciseViewSet(viewsets.ReadOnlyModelViewSet):
ordering_fields = '__all__'
filterset_fields = ('uuid',
'creation_date',
+ 'exercise_base',
'description',
'language',
'status',
@@ -242,7 +243,7 @@ class ExerciseImageViewSet(viewsets.ModelViewSet):
ordering_fields = '__all__'
filterset_fields = ('is_main',
'status',
- 'exercise',
+ 'exercise_base',
'license',
'license_author')
diff --git a/wger/exercises/migrations/0013_auto_20210503_1232.py b/wger/exercises/migrations/0013_auto_20210503_1232.py
new file mode 100644
index 000000000..0e2c06e5f
--- /dev/null
+++ b/wger/exercises/migrations/0013_auto_20210503_1232.py
@@ -0,0 +1,29 @@
+# Generated by Django 3.2 on 2021-05-03 10:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('exercises', '0012_auto_20210327_1219'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='exerciseimage',
+ old_name='exercise',
+ new_name='exercise_base',
+ ),
+ migrations.AlterField(
+ model_name='exercisebase',
+ name='license_author',
+ field=models.CharField(blank=True, help_text='If you are not the author, enter the name or source here. This is needed for some licenses e.g. the CC-BY-SA.', max_length=50, null=True, verbose_name='Author'),
+ ),
+ migrations.AlterField(
+ model_name='exercisebase',
+ name='variations',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='exercises.variation', verbose_name='Variations'),
+ ),
+ ]
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 32e0fb273..e873127a4 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -455,9 +455,9 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
verbose_name='UUID')
"""Globally unique ID, to identify the image across installations"""
- exercise = models.ForeignKey(ExerciseBase,
- verbose_name=_('Exercise'),
- on_delete=models.CASCADE)
+ exercise_base = models.ForeignKey(ExerciseBase,
+ verbose_name=_('Exercise'),
+ on_delete=models.CASCADE)
"""The exercise the image belongs to"""
image = models.ImageField(verbose_name=_('Image'),