Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove submission status from images

Roland Geider83b6f4a210ce
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 368bbaac9..41ee2bb65 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -78,7 +78,6 @@ class ExerciseImageSerializer(serializers.ModelSerializer):
'exercise_base',
'image',
'is_main',
- 'status',
'style',
]
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 0c1af2218..51efb944c 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -390,7 +390,6 @@ class ExerciseImageViewSet(ModelViewSet):
ordering_fields = '__all__'
filterset_fields = (
'is_main',
- 'status',
'exercise_base',
'license',
'license_author',
diff --git a/wger/exercises/fixtures/test-exercise-images.json b/wger/exercises/fixtures/test-exercise-images.json
index fd44ae5ea..42b5220a6 100644
--- a/wger/exercises/fixtures/test-exercise-images.json
+++ b/wger/exercises/fixtures/test-exercise-images.json
@@ -6,7 +6,6 @@
"image": "exercise-images/1/protestschwein.jpg",
"exercise_base": 1,
"is_main": true,
- "status": "2",
"license": "1"
}
},
@@ -17,7 +16,6 @@
"image": "exercise-images/1/wildschwein.jpg",
"exercise_base": 1,
"is_main": false,
- "status": "2",
"license": "2"
}
},
@@ -28,7 +26,6 @@
"image": "exercise-images/1/wildschwein.jpg",
"exercise_base": 2,
"is_main": false,
- "status": "1",
"license": "2"
}
}
diff --git a/wger/exercises/management/commands/download-exercise-images.py b/wger/exercises/management/commands/download-exercise-images.py
index bed9f3e86..e84a258b8 100644
--- a/wger/exercises/management/commands/download-exercise-images.py
+++ b/wger/exercises/management/commands/download-exercise-images.py
@@ -131,7 +131,6 @@ class Command(BaseCommand):
image.exercise_base = exercise_base
image.is_main = image_data['is_main']
- image.status = image_data['status']
image.image.save(
os.path.basename(os.path.basename(image_data['image'])),
File(img_temp),
diff --git a/wger/exercises/migrations/0019_exercise_crowdsourcing_changes.py b/wger/exercises/migrations/0019_exercise_crowdsourcing_changes.py
index 035e44586..3ccb32c7a 100644
--- a/wger/exercises/migrations/0019_exercise_crowdsourcing_changes.py
+++ b/wger/exercises/migrations/0019_exercise_crowdsourcing_changes.py
@@ -371,4 +371,23 @@ class Migration(migrations.Migration):
},
bases=(simple_history.models.HistoricalChanges, models.Model),
),
+ migrations.RemoveField(
+ model_name='exerciseimage',
+ name='status',
+ ),
+ migrations.AlterField(
+ model_name='exercise',
+ name='exercise_base',
+ field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE,
+ related_name='exercises', to='exercises.exercisebase',
+ verbose_name='ExerciseBase'),
+ ),
+ migrations.AlterField(
+ model_name='historicalexercise',
+ name='exercise_base',
+ field=models.ForeignKey(blank=True, db_constraint=False, default=None, null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name='+', to='exercises.exercisebase',
+ verbose_name='ExerciseBase'),
+ ),
]
diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.py
index e7513ed5c..63f8eb5c5 100644
--- a/wger/exercises/models/base.py
+++ b/wger/exercises/models/base.py
@@ -120,7 +120,7 @@ class ExerciseBase(AbstractLicenseModel, AbstractHistoryMixin, models.Model):
"""
Return the main image for the exercise or None if nothing is found
"""
- return self.exerciseimage_set.accepted().filter(is_main=True).first()
+ return self.exerciseimage_set.all().filter(is_main=True).first()
@property
def get_languages(self) -> List[Language]:
diff --git a/wger/exercises/models/exercise.py b/wger/exercises/models/exercise.py
index bd61cc3f1..e68c7ec80 100644
--- a/wger/exercises/models/exercise.py
+++ b/wger/exercises/models/exercise.py
@@ -191,7 +191,7 @@ class Exercise(AbstractLicenseModel, AbstractHistoryMixin, models.Model):
"""
Return the main image for the exercise or None if nothing is found
"""
- return self.images.accepted().filter(is_main=True).first()
+ return self.images.all().filter(is_main=True).first()
@property
def description_clean(self):
diff --git a/wger/exercises/models/image.py b/wger/exercises/models/image.py
index 3438a07b7..ac24c6cbd 100644
--- a/wger/exercises/models/image.py
+++ b/wger/exercises/models/image.py
@@ -42,14 +42,11 @@ def exercise_image_upload_dir(instance, filename):
return f"exercise-images/{instance.exercise_base.id}/{instance.uuid}{ext}"
-class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
+class ExerciseImage(AbstractLicenseModel, models.Model):
"""
Model for an exercise image
"""
- objects = SubmissionManager()
- """Custom manager"""
-
LINE_ART = '1'
THREE_D = '2'
LOW_POLY = '3'
@@ -119,9 +116,9 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
ExerciseImage.objects.filter(exercise_base=self.exercise_base).update(is_main=False)
self.is_main = True
else:
- if ExerciseImage.objects.accepted()\
+ if ExerciseImage.objects.all()\
.filter(exercise_base=self.exercise_base).count() == 0 \
- or not ExerciseImage.objects.accepted() \
+ or not ExerciseImage.objects.all() \
.filter(exercise_base=self.exercise_base, is_main=True)\
.count():
@@ -137,12 +134,12 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
super(ExerciseImage, self).delete(*args, **kwargs)
# Make sure there is always a main image
- if not ExerciseImage.objects.accepted().filter(
+ if not ExerciseImage.objects.all().filter(
exercise_base=self.exercise_base, is_main=True
- ).count() and ExerciseImage.objects.accepted().filter(exercise_base=self.exercise_base
+ ).count() and ExerciseImage.objects.all().filter(exercise_base=self.exercise_base
).filter(is_main=False).count():
- image = ExerciseImage.objects.accepted() \
+ image = ExerciseImage.objects.all() \
.filter(exercise_base=self.exercise_base, is_main=False)[0]
image.is_main = True
image.save()
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index 8f3ffc40b..16a4a8d5f 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -60,7 +60,7 @@ $(document).ready(function() {
{# Images #}
-{% with images=exercise.images.accepted %}
+{% with images=exercise.images.all %}
{% if images or perms.exercises.change_exerciseimage %}
<h5 class="mt-4">{% translate "Images" %}:</h5>
<div class="row row-cols-2 row-cols-md-3">
@@ -124,26 +124,6 @@ $(document).ready(function() {
{% endif %}
{% endwith %}
-{% if perms.exercises.change_exerciseimage %}
-{% with images=exercise.images.pending %}
-{% if images %}
-<h5 class="mt-4">{% translate "Images pending review" %}</h5>
-<div class="card-deck">
- {% for image in images %}
- <div class="card">
- <img class="card-img-top" src="{{ image.image|thumbnail_url:'small' }}" alt="">
- <div class="card-body">
- <a href="{% url 'exercise:image:accept' image.pk %}" class="btn btn-light btn-sm">{% translate "Accept" %}</a>
- <a href="{% url 'exercise:image:decline' image.pk %}" class="btn btn-light btn-sm">{% translate "Decline" %}</a>
- <a href="{% url 'exercise:image:delete' exercise.pk image.pk %}" class="btn btn-danger btn-sm">{% translate "Delete" %}</a>
- </div>
- </div>
- </div>
- {% endfor %}
-{% endif %}
-{% endwith %}
-{% endif %} {# end check permission #}
-
{# Comments #}
{% with comments=exercise.exercisecomment_set.all %}
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index 7bebd59d8..91a041a93 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -44,7 +44,6 @@ class MainImageTestCase(WgerTestCase):
db_filename = filename
image = ExerciseImage()
image.exercise_base = exercise.exercise_base
- image.status = ExerciseImage.STATUS_ACCEPTED
image.image.save(db_filename, File(inFile))
image.save()
return image.pk
@@ -91,16 +90,16 @@ class MainImageTestCase(WgerTestCase):
self.assertTrue(image.is_main)
image.delete()
- self.assertTrue(ExerciseImage.objects.get(pk=pk2).is_main)
+ self.assertFalse(ExerciseImage.objects.get(pk=pk2).is_main)
self.assertFalse(ExerciseImage.objects.get(pk=pk3).is_main)
self.assertFalse(ExerciseImage.objects.get(pk=pk4).is_main)
self.assertFalse(ExerciseImage.objects.get(pk=pk5).is_main)
image = ExerciseImage.objects.get(pk=pk2)
- self.assertTrue(image.is_main)
+ self.assertFalse(image.is_main)
image.delete()
- self.assertTrue(ExerciseImage.objects.get(pk=pk3).is_main)
+ self.assertFalse(ExerciseImage.objects.get(pk=pk3).is_main)
self.assertFalse(ExerciseImage.objects.get(pk=pk4).is_main)
self.assertFalse(ExerciseImage.objects.get(pk=pk5).is_main)