Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Rename other references to ExerciseImage.exercise

Roland Geiderf1e75d11f9a5
diff --git a/wger/exercises/fixtures/test-exercise-images.json b/wger/exercises/fixtures/test-exercise-images.json
index e7795913d..fd44ae5ea 100644
--- a/wger/exercises/fixtures/test-exercise-images.json
+++ b/wger/exercises/fixtures/test-exercise-images.json
@@ -4,7 +4,7 @@
"model": "exercises.exerciseimage",
"fields": {
"image": "exercise-images/1/protestschwein.jpg",
- "exercise": 1,
+ "exercise_base": 1,
"is_main": true,
"status": "2",
"license": "1"
@@ -15,7 +15,7 @@
"model": "exercises.exerciseimage",
"fields": {
"image": "exercise-images/1/wildschwein.jpg",
- "exercise": 1,
+ "exercise_base": 1,
"is_main": false,
"status": "2",
"license": "2"
@@ -26,7 +26,7 @@
"model": "exercises.exerciseimage",
"fields": {
"image": "exercise-images/1/wildschwein.jpg",
- "exercise": 2,
+ "exercise_base": 2,
"is_main": false,
"status": "1",
"license": "2"
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index e873127a4..768b9bc10 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -439,7 +439,7 @@ def exercise_image_upload_dir(instance, filename):
"""
Returns the upload target for exercise images
"""
- return "exercise-images/{0}/{1}".format(instance.exercise.id, filename)
+ return "exercise-images/{0}/{1}".format(instance.exercise_base.id, filename)
class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
@@ -485,13 +485,15 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
Only one image can be marked as main picture at a time
"""
if self.is_main:
- ExerciseImage.objects.filter(exercise=self.exercise).update(is_main=False)
+ ExerciseImage.objects.filter(exercise_base=self.exercise_base).update(is_main=False)
self.is_main = True
else:
- if ExerciseImage.objects.accepted().filter(exercise=self.exercise).count() == 0 \
+ if ExerciseImage.objects.accepted()\
+ .filter(exercise_base=self.exercise_base).count() == 0 \
or not ExerciseImage.objects.accepted() \
- .filter(exercise=self.exercise, is_main=True)\
- .count():
+ .filter(exercise_base=self.exercise_base, is_main=True)\
+ .count():
+
self.is_main = True
#
@@ -520,14 +522,14 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
# Make sure there is always a main image
if not ExerciseImage.objects.accepted() \
- .filter(exercise=self.exercise, is_main=True).count() \
+ .filter(exercise_base=self.exercise_base, is_main=True).count() \
and ExerciseImage.objects.accepted() \
- .filter(exercise=self.exercise) \
+ .filter(exercise_base=self.exercise_base) \
.filter(is_main=False) \
.count():
image = ExerciseImage.objects.accepted() \
- .filter(exercise=self.exercise, is_main=False)[0]
+ .filter(exercise_base=self.exercise_base, is_main=False)[0]
image.is_main = True
image.save()
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index 0520b0e33..01279b41f 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -43,7 +43,7 @@ class MainImageTestCase(WgerTestCase):
if not db_filename:
db_filename = filename
image = ExerciseImage()
- image.exercise = exercise.exercise_base
+ image.exercise_base = exercise.exercise_base
image.status = ExerciseImage.STATUS_ACCEPTED
image.image.save(
db_filename,
diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.py
index 59cadf11d..8b4884cc5 100644
--- a/wger/exercises/views/images.py
+++ b/wger/exercises/views/images.py
@@ -69,7 +69,7 @@ class ExerciseImageEditView(WgerFormMixin,
form_class = ExerciseImageForm
def get_success_url(self):
- return reverse('exercise:exercise:view', kwargs={'id': self.object.exercise.id})
+ return reverse('exercise:exercise:view', kwargs={'id': self.object.exercise_base.id})
# Send some additional data to the template
def get_context_data(self, **kwargs):
@@ -94,7 +94,7 @@ class ExerciseImageAddView(WgerFormMixin,
def form_valid(self, form):
"""Set the exercise base and the author"""
exercise = get_object_or_404(Exercise, pk=self.kwargs['exercise_pk'])
- form.instance.exercise = exercise.exercise_base
+ form.instance.exercise_base = exercise.exercise_base
form.instance.set_author(self.request)
return super(ExerciseImageAddView, self).form_valid(form)