Self hosted FLOSS fitness/workout, nutrition and weight tracker
Move common logic used when creating exercises to the model
Roland Geidere98d7759505c
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 8abe6765b..72e28ce42 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -27,7 +27,6 @@ from easy_thumbnails.files import get_thumbnailerfrom django.utils.translation import ugettext as _from wger.config.models import LanguageConfig-from wger.exercises.models import Exercisefrom wger.exercises.models import Equipmentfrom wger.exercises.models import ExerciseCategory@@ -35,6 +34,7 @@ from wger.exercises.models import ExerciseImagefrom wger.exercises.models import ExerciseCommentfrom wger.exercises.models import Musclefrom wger.utils.language import load_item_languages+from wger.utils.language import load_languagefrom wger.utils.permissions import CreateOnlyPermission@@ -57,10 +57,10 @@ class ExerciseViewSet(viewsets.ModelViewSet):def pre_save(self, obj):'''- Set the license data+ Set language, author and status'''- if not obj.license_author:- obj.license_author = self.request.user.username+ obj.language = load_language()+ obj.set_author(self.request)@api_view(['GET'])diff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex 05e164db7..018cc2b4c 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -328,6 +328,28 @@ class Exercise(AbstractLicenseModel, models.Model):[user.email],fail_silently=True)+ def set_author(self, request):+ '''+ Set author and status++ This is only used when creating exercises (via web or API)+ '''+ if request.user.has_perm('exercises.add_exercise'):+ self.status = self.EXERCISE_STATUS_ADMIN+ if not self.license_author:+ self.license_author = 'wger.de'++ else:+ if not self.license_author:+ self.license_author = request.user.username++ subject = _('New user submitted exercise')+ message = _(u'''The user {0} submitted a new exercise "{1}".'''.format(+ request.user.username, self.name))+ mail.mail_admins(subject,+ message,+ fail_silently=True)+def exercise_image_upload_dir(instance, filename):'''diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex f92bc7f07..4bbdc8a6f 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -208,28 +208,10 @@ class ExerciseAddView(ExercisesEditAddView, CreateView, WgerPermissionMixin):def form_valid(self, form):'''- Set the user that submitted the exercise-- If admin, set appropriate status+ Set language, author and status'''form.instance.language = load_language()-- if self.request.user.has_perm('exercises.add_exercise'):- form.instance.status = Exercise.EXERCISE_STATUS_ADMIN- if not form.instance.license_author:- form.instance.license_author = 'wger.de'-- else:- if not form.instance.license_author:- form.instance.license_author = self.request.user.username-- subject = _('New user submitted exercise')- message = _(u'''The user {0} submitted a new exercise "{1}".'''.format(- self.request.user.username, form.instance.name))- mail.mail_admins(subject,- message,- fail_silently=True)-+ form.instance.set_author(self.request)return super(ExerciseAddView, self).form_valid(form)def dispatch(self, request, *args, **kwargs):