Self hosted FLOSS fitness/workout, nutrition and weight tracker
Refactor common logic used for user-submitted models
Roland Geiderabeb18e99e81
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 72e28ce42..84a8ce14c 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -78,7 +78,7 @@ def search(request):languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)exercises = (Exercise.objects.filter(name__icontains=q).filter(language__in=languages)- .filter(status__in=Exercise.EXERCISE_STATUS_OK)+ .filter(status=Exercise.STATUS_ACCEPTED).order_by('category__name', 'name').distinct())@@ -152,8 +152,7 @@ class ExerciseImageViewSet(viewsets.ModelViewSet):'''Set the license data'''- if not obj.license_author:- obj.license_author = self.request.user.username+ obj.set_author(self.request)class ExerciseCommentViewSet(viewsets.ReadOnlyModelViewSet):diff --git a/wger/exercises/fixtures/test-exercise-images.json b/wger/exercises/fixtures/test-exercise-images.jsonindex 8a33826e9..96a6ead75 100644--- a/wger/exercises/fixtures/test-exercise-images.json+++ b/wger/exercises/fixtures/test-exercise-images.json@@ -6,6 +6,7 @@"image": "exercise-images/1/protestschwein.jpg","exercise": 1,"is_main": true,+ "status": "2","license": "1"}},@@ -16,6 +17,7 @@"image": "exercise-images/1/wildschwein.jpg","exercise": 1,"is_main": false,+ "status": "2","license": "2"}}diff --git a/wger/exercises/fixtures/test-exercises.json b/wger/exercises/fixtures/test-exercises.jsonindex 61a831dc0..68004776f 100644--- a/wger/exercises/fixtures/test-exercises.json+++ b/wger/exercises/fixtures/test-exercises.json@@ -55,7 +55,7 @@"pk": 1,"model": "exercises.exercise","fields": {- "status": "5",+ "status": "2","category": 2,"language": 1,"muscles": [@@ -73,7 +73,7 @@"pk": 2,"model": "exercises.exercise","fields": {- "status": "5",+ "status": "2","category": 2,"language": 2,"muscles": [@@ -91,7 +91,7 @@"pk": 3,"model": "exercises.exercise","fields": {- "status": "5",+ "status": "2","category": 3,"language": 1,"muscles": [@@ -120,7 +120,7 @@"pk": 35,"model": "exercises.exercise","fields": {- "status": "5",+ "status": "2","category": 3,"language": 1,"muscles": [@@ -135,7 +135,7 @@"pk": 81,"model": "exercises.exercise","fields": {- "status": "5",+ "status": "2","category": 3,"language": 1,"muscles": [@@ -150,7 +150,7 @@"pk": 84,"model": "exercises.exercise","fields": {- "status": "5",+ "status": "2","category": 3,"language": 2,"muscles": [@@ -165,7 +165,7 @@"pk": 91,"model": "exercises.exercise","fields": {- "status": "5",+ "status": "2","category": 3,"language": 2,"muscles": [@@ -180,7 +180,7 @@"pk": 111,"model": "exercises.exercise","fields": {- "status": "5",+ "status": "2","category": 3,"language": 2,"muscles": [@@ -195,7 +195,7 @@"pk": 126,"model": "exercises.exercise","fields": {- "status": "5",+ "status": "2","category": 3,"language": 2,"muscles": [diff --git a/wger/exercises/management/commands/submitted-exercises.py b/wger/exercises/management/commands/submitted-exercises.pyindex 854d33c7e..84ae13faf 100644--- a/wger/exercises/management/commands/submitted-exercises.py+++ b/wger/exercises/management/commands/submitted-exercises.py@@ -29,7 +29,7 @@ class Command(BaseCommand):def handle(self, *args, **options):- exercises = Exercise.objects.filter(status=Exercise.EXERCISE_STATUS_ACCEPTED)+ exercises = Exercise.objects.accepted()usernames = []for exercise in exercises:if exercise.user not in usernames:diff --git a/wger/exercises/migrations/0002_auto__add_field_exercise_user__add_field_exercise_status.py b/wger/exercises/migrations/0002_auto__add_field_exercise_user__add_field_exercise_status.pyindex 26392d0cc..935c0b1c4 100644--- a/wger/exercises/migrations/0002_auto__add_field_exercise_user__add_field_exercise_status.py+++ b/wger/exercises/migrations/0002_auto__add_field_exercise_user__add_field_exercise_status.py@@ -22,7 +22,7 @@ class Migration(SchemaMigration):# Set the status 'system' for all existing exercises in the databasedb.start_transaction()if not db.dry_run:- orm.Exercise.objects.all().update(status=Exercise.EXERCISE_STATUS_SYSTEM)+ orm.Exercise.objects.all().update(status='5')db.commit_transaction()# Note: we need to open and close the transaction here for postgresql.# see https://github.com/rolandgeider/wger/issues/26diff --git a/wger/exercises/migrations/0021_submission_status.py b/wger/exercises/migrations/0021_submission_status.pynew file mode 100644index 000000000..fac8c3922--- /dev/null+++ b/wger/exercises/migrations/0021_submission_status.py@@ -0,0 +1,88 @@+# -*- coding: utf-8 -*-+from south.utils import datetime_utils as datetime+from south.db import db+from south.v2 import DataMigration+from django.db import models++class Migration(DataMigration):++ def forwards(self, orm):+ '''+ Map the old submission status to the easier, more simple new ones:++ EXERCISE_STATUS_ADMIN ('4') and EXERCISE_STATUS_SYSTEM ('5') are removed+ and are just mapped to STATUS_ACCEPTED ('2')+ '''++ for exercise in orm.Exercise.objects.all():+ if exercise.status in ('4', '5'):+ exercise.status = '2'+ exercise.save()++ def backwards(self, orm):+ pass++ models = {+ u'core.language': {+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})+ },+ u'core.license': {+ 'Meta': {'ordering': "['full_name']", 'object_name': 'License'},+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '60'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '15'}),+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})+ },+ u'exercises.equipment': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Equipment'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'exercises.exercise': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Exercise'},+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.ExerciseCategory']"}),+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),+ 'equipment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Equipment']", 'null': 'True', 'blank': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.Language']"}),+ 'license': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['core.License']"}),+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),+ 'muscles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Muscle']", 'null': 'True', 'blank': 'True'}),+ 'muscles_secondary': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'secondary_muscles'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['exercises.Muscle']"}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'})+ },+ u'exercises.exercisecategory': {+ 'Meta': {'ordering': "['name']", 'object_name': 'ExerciseCategory'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})+ },+ u'exercises.exercisecomment': {+ 'Meta': {'object_name': 'ExerciseComment'},+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '200'}),+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})+ },+ u'exercises.exerciseimage': {+ 'Meta': {'ordering': "['-is_main', 'id']", 'object_name': 'ExerciseImage'},+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),+ 'is_main': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'license': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['core.License']"}),+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'})+ },+ u'exercises.muscle': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Muscle'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_front': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ }+ }++ complete_apps = ['exercises']+ symmetrical = Truediff --git a/wger/exercises/migrations/0022_auto__add_field_exerciseimage_status.py b/wger/exercises/migrations/0022_auto__add_field_exerciseimage_status.pynew file mode 100644index 000000000..b8dad82f3--- /dev/null+++ b/wger/exercises/migrations/0022_auto__add_field_exerciseimage_status.py@@ -0,0 +1,85 @@+# -*- coding: utf-8 -*-+from south.utils import datetime_utils as datetime+from south.db import db+from south.v2 import SchemaMigration+from django.db import models+++class Migration(SchemaMigration):++ def forwards(self, orm):+ # Adding field 'ExerciseImage.status'+ db.add_column(u'exercises_exerciseimage', 'status',+ self.gf('django.db.models.fields.CharField')(default='1', max_length=2),+ keep_default=False)+++ def backwards(self, orm):+ # Deleting field 'ExerciseImage.status'+ db.delete_column(u'exercises_exerciseimage', 'status')+++ models = {+ u'core.language': {+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})+ },+ u'core.license': {+ 'Meta': {'ordering': "['full_name']", 'object_name': 'License'},+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '60'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '15'}),+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})+ },+ u'exercises.equipment': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Equipment'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'exercises.exercise': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Exercise'},+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.ExerciseCategory']"}),+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),+ 'equipment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Equipment']", 'null': 'True', 'blank': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.Language']"}),+ 'license': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['core.License']"}),+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),+ 'muscles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Muscle']", 'null': 'True', 'blank': 'True'}),+ 'muscles_secondary': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'secondary_muscles'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['exercises.Muscle']"}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'})+ },+ u'exercises.exercisecategory': {+ 'Meta': {'ordering': "['name']", 'object_name': 'ExerciseCategory'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})+ },+ u'exercises.exercisecomment': {+ 'Meta': {'object_name': 'ExerciseComment'},+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '200'}),+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})+ },+ u'exercises.exerciseimage': {+ 'Meta': {'ordering': "['-is_main', 'id']", 'object_name': 'ExerciseImage'},+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),+ 'is_main': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'license': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['core.License']"}),+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'})+ },+ u'exercises.muscle': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Muscle'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_front': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ }+ }++ complete_apps = ['exercises']\ No newline at end of filediff --git a/wger/exercises/migrations/0023_submission_status_images.py b/wger/exercises/migrations/0023_submission_status_images.pynew file mode 100644index 000000000..893664a53--- /dev/null+++ b/wger/exercises/migrations/0023_submission_status_images.py@@ -0,0 +1,83 @@+# -*- coding: utf-8 -*-+from south.utils import datetime_utils as datetime+from south.db import db+from south.v2 import DataMigration+from django.db import models++class Migration(DataMigration):++ def forwards(self, orm):+ "Write your forwards methods here."+ # Note: Don't use "from appname.models import ModelName".+ # Use orm.ModelName to refer to models in this application,+ # and orm['appname.ModelName'] for models in other applications.+ orm.ExerciseImage.objects.all().update(status='2')++ def backwards(self, orm):+ "Write your backwards methods here."++ models = {+ u'core.language': {+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})+ },+ u'core.license': {+ 'Meta': {'ordering': "['full_name']", 'object_name': 'License'},+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '60'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '15'}),+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})+ },+ u'exercises.equipment': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Equipment'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'exercises.exercise': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Exercise'},+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.ExerciseCategory']"}),+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),+ 'equipment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Equipment']", 'null': 'True', 'blank': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.Language']"}),+ 'license': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['core.License']"}),+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),+ 'muscles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Muscle']", 'null': 'True', 'blank': 'True'}),+ 'muscles_secondary': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'secondary_muscles'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['exercises.Muscle']"}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'})+ },+ u'exercises.exercisecategory': {+ 'Meta': {'ordering': "['name']", 'object_name': 'ExerciseCategory'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})+ },+ u'exercises.exercisecomment': {+ 'Meta': {'object_name': 'ExerciseComment'},+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '200'}),+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})+ },+ u'exercises.exerciseimage': {+ 'Meta': {'ordering': "['-is_main', 'id']", 'object_name': 'ExerciseImage'},+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),+ 'is_main': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'license': ('django.db.models.fields.related.ForeignKey', [], {'default': '1', 'to': u"orm['core.License']"}),+ 'license_author': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'})+ },+ u'exercises.muscle': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Muscle'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_front': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ }+ }++ complete_apps = ['exercises']+ symmetrical = Truediff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex 018cc2b4c..0fe6e6912 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -33,9 +33,12 @@ from easy_thumbnails.signals import saved_filefrom easy_thumbnails.signal_handlers import generate_aliases_globalfrom wger.core.models import Language+from wger.utils.managers import SubmissionManagerfrom wger.utils.models import AbstractLicenseModel+from wger.utils.models import AbstractSubmissionModelfrom wger.utils.constants import EMAIL_FROM-from wger.utils.cache import delete_template_fragment_cache, reset_workout_canonical_form+from wger.utils.cache import delete_template_fragment_cache+from wger.utils.cache import reset_workout_canonical_formfrom wger.utils.cache import cache_mapper@@ -147,28 +150,13 @@ class ExerciseCategory(models.Model):super(ExerciseCategory, self).delete(*args, **kwargs)-class Exercise(AbstractLicenseModel, models.Model):+class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):'''Model for an exercise'''- EXERCISE_STATUS_PENDING = '1'- EXERCISE_STATUS_ACCEPTED = '2'- EXERCISE_STATUS_DECLINED = '3'- EXERCISE_STATUS_ADMIN = '4'- EXERCISE_STATUS_SYSTEM = '5'-- EXERCISE_STATUS = (- (EXERCISE_STATUS_PENDING, _('Pending')),- (EXERCISE_STATUS_ACCEPTED, _('Accepted')),- (EXERCISE_STATUS_DECLINED, _('Declined')),- (EXERCISE_STATUS_ADMIN, _('Submitted by administrator')),- (EXERCISE_STATUS_SYSTEM, _('System exercise')),- )-- EXERCISE_STATUS_OK = (EXERCISE_STATUS_ACCEPTED,- EXERCISE_STATUS_ADMIN,- EXERCISE_STATUS_SYSTEM)+ objects = SubmissionManager()+ '''Custom manager'''category = models.ForeignKey(ExerciseCategory,verbose_name=_('Category'))@@ -198,14 +186,10 @@ class Exercise(AbstractLicenseModel, models.Model):blank=True)'''Equipment needed by this exercise'''- # Non-editable fields- status = models.CharField(max_length=2,- choices=EXERCISE_STATUS,- default=EXERCISE_STATUS_PENDING,- editable=False)- '''Status, e.g. accepted or declined'''-- creation_date = models.DateField(_('Date'), auto_now_add=True, null=True, blank=True)+ creation_date = models.DateField(_('Date'),+ auto_now_add=True,+ null=True,+ blank=True)'''The submission date'''language = models.ForeignKey(Language,@@ -335,7 +319,7 @@ class Exercise(AbstractLicenseModel, models.Model):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+ self.status = self.STATUS_ACCEPTEDif not self.license_author:self.license_author = 'wger.de'@@ -358,11 +342,14 @@ def exercise_image_upload_dir(instance, filename):return "exercise-images/{0}/{1}".format(instance.exercise.id, filename)-class ExerciseImage(AbstractLicenseModel, models.Model):+class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model):'''Model for an exercise image'''+ objects = SubmissionManager()+ '''Custom manager'''+exercise = models.ForeignKey(Exercise,verbose_name=_('Exercise'),editable=False)@@ -395,8 +382,10 @@ class ExerciseImage(AbstractLicenseModel, models.Model):ExerciseImage.objects.filter(exercise=self.exercise).update(is_main=False)self.is_main = Trueelse:- if ExerciseImage.objects.filter(exercise=self.exercise).count() == 0 \- or not ExerciseImage.objects.filter(exercise=self.exercise, is_main=True).count():+ if ExerciseImage.objects.accepted().filter(exercise=self.exercise).count() == 0 \+ or not ExerciseImage.objects.accepted() \+ .filter(exercise=self.exercise, is_main=True)\+ .count():self.is_main = True#@@ -436,9 +425,15 @@ class ExerciseImage(AbstractLicenseModel, models.Model):delete_template_fragment_cache('equipment-overview-mobile', language.id)# Make sure there is always a main image- if not ExerciseImage.objects.filter(exercise=self.exercise, is_main=True).count()\- and ExerciseImage.objects.filter(exercise=self.exercise).filter(is_main=False).count():- image = ExerciseImage.objects.filter(exercise=self.exercise, is_main=False)[0]+ if not ExerciseImage.objects.accepted() \+ .filter(exercise=self.exercise, is_main=True).count() \+ and ExerciseImage.objects.accepted() \+ .filter(exercise=self.exercise) \+ .filter(is_main=False) \+ .count():++ image = ExerciseImage.objects.accepted() \+ .filter(exercise=self.exercise, is_main=False)[0]image.is_main = Trueimage.save()@@ -448,6 +443,30 @@ class ExerciseImage(AbstractLicenseModel, models.Model):'''return False+ def set_author(self, request):+ '''+ Set author and status++ This is only used when creating images (via web or API)+ '''+ if request.user.has_perm('exercises.add_exerciseimage'):+ self.status = self.STATUS_ACCEPTED+ 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 image')+ message = _(u'''The user {0} submitted a new image "{1}" for exercise {2}.'''.format(+ request.user.username,+ self.name,+ self.exercise))+ mail.mail_admins(subject,+ message,+ fail_silently=True)+def delete_exercise_image_on_delete(sender, instance, **kwargs):'''diff --git a/wger/exercises/sitemap.py b/wger/exercises/sitemap.pyindex 1634aa68e..d86ed4e3b 100644--- a/wger/exercises/sitemap.py+++ b/wger/exercises/sitemap.py@@ -26,6 +26,4 @@ class ExercisesSitemap(Sitemap):def items(self):language_list = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)-- return (Exercise.objects.filter(language__in=language_list)- .filter(status__in=Exercise.EXERCISE_STATUS_OK))+ return Exercise.objects.accepted().filter(language__in=language_list)diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.htmlindex b0f0b09be..4e9bf7e78 100644--- a/wger/exercises/templates/exercise/view.html+++ b/wger/exercises/templates/exercise/view.html@@ -30,7 +30,7 @@ function custom_modal_init()-->{% block content %}-{% if exercise.status == exercise.EXERCISE_STATUS_PENDING %}+{% if exercise.status == exercise.STATUS_PENDING %}<div class="alert"><h3>{% trans "Exercise is pending review" %}</h3><p>{% blocktrans %}This user submitted exercise is pending a decision to be@@ -140,7 +140,7 @@ included in the database.{% endblocktrans %}{# #}{# Images #}{# #}-{% with images=exercise.exerciseimage_set.all %}+{% with images=exercise.exerciseimage_set.accepted %}{% if images %}<h3>{% trans "Images" %}</h3>diff --git a/wger/exercises/templates/mobile/exercise/view.html b/wger/exercises/templates/mobile/exercise/view.htmlindex 36b7c3563..d06996d26 100644--- a/wger/exercises/templates/mobile/exercise/view.html+++ b/wger/exercises/templates/mobile/exercise/view.html@@ -30,7 +30,7 @@ function custom_modal_init()-->{% block content %}-{% if exercise.status == exercise.EXERCISE_STATUS_PENDING %}+{% if exercise.status == exercise.STATUS_PENDING %}<div class="alert"><h3>{% trans "Exercise is pending review" %}</h3><p>{% blocktrans %}This user submitted exercise is pending a decision to bediff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.pyindex 23cf85911..62238f2b9 100644--- a/wger/exercises/tests/test_exercise.py+++ b/wger/exercises/tests/test_exercise.py@@ -257,10 +257,10 @@ class ExercisesTestCase(WorkoutManagerTestCase):exercise = Exercise.objects.get(pk=exercise_id)if admin:self.assertEqual(exercise.license_author, 'wger.de')- self.assertEqual(exercise.status, Exercise.EXERCISE_STATUS_ADMIN)+ self.assertEqual(exercise.status, Exercise.STATUS_ACCEPTED)else:self.assertEqual(exercise.license_author, 'test')- self.assertEqual(exercise.status, Exercise.EXERCISE_STATUS_PENDING)+ self.assertEqual(exercise.status, Exercise.STATUS_PENDING)response = self.client.get(reverse('exercise-view', kwargs={'id': exercise_id}))self.assertEqual(response.status_code, 200)diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.pyindex 201cf5386..c0c7e462c 100644--- a/wger/exercises/tests/test_exercise_images.py+++ b/wger/exercises/tests/test_exercise_images.py@@ -39,6 +39,7 @@ class MainImageTestCase(WorkoutManagerTestCase):db_filename = filenameimage = ExerciseImage()image.exercise = exercise+ image.status = ExerciseImage.STATUS_ACCEPTEDimage.image.save(filename,File(open('wger/exercises/tests/{0}'.format(filename)), 'rb')diff --git a/wger/exercises/tests/test_submitted_exercise.py b/wger/exercises/tests/test_submitted_exercise.pyindex 33790c4ea..107cef547 100644--- a/wger/exercises/tests/test_submitted_exercise.py+++ b/wger/exercises/tests/test_submitted_exercise.py@@ -117,19 +117,19 @@ class ExerciseAcceptTestCase(WorkoutManagerTestCase):Helper function'''exercise = Exercise.objects.get(pk=4)- self.assertEqual(exercise.status, Exercise.EXERCISE_STATUS_PENDING)+ self.assertEqual(exercise.status, Exercise.STATUS_PENDING)response = self.client.get(reverse('exercise-accept', kwargs={'pk': 4}))exercise = Exercise.objects.get(pk=4)self.assertEqual(response.status_code, 302)if not fail:- self.assertEqual(exercise.status, Exercise.EXERCISE_STATUS_ACCEPTED)+ self.assertEqual(exercise.status, Exercise.STATUS_ACCEPTED)response = self.client.get(response['Location'])self.assertEqual(response.status_code, 200)self.assertEqual(len(mail.outbox), 1)else:- self.assertEqual(exercise.status, Exercise.EXERCISE_STATUS_PENDING)+ self.assertEqual(exercise.status, Exercise.STATUS_PENDING)self.assertEqual(len(mail.outbox), 0)def test_accept_admin(self):@@ -166,18 +166,18 @@ class ExerciseRejectTestCase(WorkoutManagerTestCase):Helper function'''exercise = Exercise.objects.get(pk=4)- self.assertEqual(exercise.status, Exercise.EXERCISE_STATUS_PENDING)+ self.assertEqual(exercise.status, Exercise.STATUS_PENDING)response = self.client.get(reverse('exercise-decline', kwargs={'pk': 4}))exercise = Exercise.objects.get(pk=4)self.assertEqual(response.status_code, 302)if not fail:- self.assertEqual(exercise.status, Exercise.EXERCISE_STATUS_DECLINED)+ self.assertEqual(exercise.status, Exercise.STATUS_DECLINED)response = self.client.get(response['Location'])self.assertEqual(response.status_code, 200)else:- self.assertEqual(exercise.status, Exercise.EXERCISE_STATUS_PENDING)+ self.assertEqual(exercise.status, Exercise.STATUS_PENDING)def test_reject_admin(self):'''diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex 4bbdc8a6f..6f03d778d 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -69,7 +69,7 @@ class ExerciseListView(WgerPermissionMixin, ListView):Filter to only active exercises in the configured languages'''languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)- return Exercise.objects.filter(status__in=Exercise.EXERCISE_STATUS_OK) \+ return Exercise.objects.accepted() \.filter(language__in=languages) \.order_by('category__id') \.select_related()@@ -260,8 +260,7 @@ class PendingExerciseListView(WgerPermissionMixin, ListView):'''Only show pending exercises'''- return Exercise.objects.filter(status=Exercise.EXERCISE_STATUS_PENDING) \- .order_by('-creation_date')+ return Exercise.objects.pending().order_by('-creation_date')@permission_required('exercises.add_exercise')@@ -270,7 +269,7 @@ def accept(request, pk):Accepts a pending user submitted exercise and emails the user, if possible'''exercise = get_object_or_404(Exercise, pk=pk)- exercise.status = Exercise.EXERCISE_STATUS_ACCEPTED+ exercise.status = Exercise.STATUS_ACCEPTEDexercise.save()exercise.send_email(request)messages.success(request, _('Exercise was successfully added to the general database'))@@ -284,7 +283,7 @@ def decline(request, pk):Declines and deletes a pending user submitted exercise'''exercise = get_object_or_404(Exercise, pk=pk)- exercise.status = Exercise.EXERCISE_STATUS_DECLINED+ exercise.status = Exercise.STATUS_DECLINEDexercise.save()messages.success(request, _('Exercise was successfully marked as rejected'))return HttpResponseRedirect(exercise.get_absolute_url())diff --git a/wger/manager/views/set.py b/wger/manager/views/set.pyindex 8feab6372..47f85e862 100644--- a/wger/manager/views/set.py+++ b/wger/manager/views/set.py@@ -73,8 +73,8 @@ def create(request, day_pk):# by language and statusif request.flavour == 'mobile':languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)- form.fields['exercise_list'].queryset = Exercise.objects.filter(language__in=languages) \- .filter(status__in=Exercise.EXERCISE_STATUS_OK)+ form.fields['exercise_list'].queryset = Exercise.objects.accepted() \+ .filter(language__in=languages)# If the form and all formsets validate, save themif request.method == "POST":diff --git a/wger/utils/managers.py b/wger/utils/managers.pynew file mode 100644index 000000000..4663154e3--- /dev/null+++ b/wger/utils/managers.py@@ -0,0 +1,47 @@+# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU Affero General Public License+# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.++from django.db import models+from django.db.models.query import QuerySet+from wger.utils.models import AbstractSubmissionModel+++'''+Custom managers and querysets+'''++# TODO: starting with django 1.7 this is simplified, see+# https://docs.djangoproject.com/en/1.7/topics/db/managers/#creating-manager-with-queryset-methods+++class SubmissionQuerySet(QuerySet):+ def accepted(self):+ return self.filter(status=AbstractSubmissionModel.STATUS_ACCEPTED)++ def pending(self):+ return self.filter(status=AbstractSubmissionModel.STATUS_PENDING)+++class SubmissionManager(models.Manager):+ use_for_related_fields = True++ def get_queryset(self):+ return SubmissionQuerySet(self.model, using=self._db)++ def accepted(self):+ return self.get_queryset().accepted()++ def pending(self):+ return self.get_queryset().pending()diff --git a/wger/utils/models.py b/wger/utils/models.pyindex fe04111ff..033c03b2d 100644--- a/wger/utils/models.py+++ b/wger/utils/models.py@@ -30,6 +30,9 @@ class AbstractLicenseModel(models.Model):Abstract class that adds license information to a model'''+ class Meta:+ abstract = True+license = models.ForeignKey(License,verbose_name=_('License'),default=1)@@ -44,5 +47,31 @@ class AbstractLicenseModel(models.Model):'e.g. the CC-BY-SA.'))'''The author if it is not the uploader'''++class AbstractSubmissionModel(models.Model):+ '''+ Abstract class used for model for user submitted data.++ These models have to be approved first by an administrator before they are+ shows in the website. There is also a manager that can be used:+ utils.managers.SubmissionManager+ '''+class Meta:abstract = True++ STATUS_PENDING = '1'+ STATUS_ACCEPTED = '2'+ STATUS_DECLINED = '3'++ STATUS = (+ (STATUS_PENDING, _('Pending')),+ (STATUS_ACCEPTED, _('Accepted')),+ (STATUS_DECLINED, _('Declined')),+ )++ status = models.CharField(max_length=2,+ choices=STATUS,+ default=STATUS_PENDING,+ editable=False)+ '''Status of the submission, e.g. accepted or declined'''