Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove the 'user' field from ingredients and use the license author instead

Roland Geider5d8b6ef72139
diff --git a/wger/exercises/fixtures/test-exercises.json b/wger/exercises/fixtures/test-exercises.json
index db7c7b624..61a831dc0 100644
--- a/wger/exercises/fixtures/test-exercises.json
+++ b/wger/exercises/fixtures/test-exercises.json
@@ -66,7 +66,6 @@
3
],
"description": "",
- "user": null,
"name": "An exercise"
}
},
@@ -85,7 +84,6 @@
3
],
"description": "",
- "user": null,
"name": "Very cool exercise"
}
},
@@ -100,7 +98,6 @@
1
],
"description": "",
- "user": null,
"name": "Boring exercise"
}
},
@@ -115,7 +112,7 @@
1
],
"description": "",
- "user": "test",
+ "license_author": "test",
"name": "Pending exercise"
}
},
@@ -131,7 +128,6 @@
],
"muscles_secondary":[],
"description": "",
- "user": null,
"name": "Needed for demo user"
}
},
@@ -147,7 +143,6 @@
],
"muscles_secondary":[],
"description": "",
- "user": null,
"name": "Needed for demo user"
}
},
@@ -163,7 +158,6 @@
],
"muscles_secondary":[],
"description": "",
- "user": null,
"name": "Needed for demo user"
}
},
@@ -179,7 +173,6 @@
],
"muscles_secondary":[],
"description": "",
- "user": null,
"name": "Needed for demo user"
}
},
@@ -195,7 +188,6 @@
],
"muscles_secondary":[],
"description": "",
- "user": null,
"name": "Needed for demo user"
}
},
@@ -211,7 +203,6 @@
],
"muscles_secondary":[],
"description": "",
- "user": null,
"name": "Needed for demo user"
}
},
diff --git a/wger/exercises/migrations/0019_license_author.py b/wger/exercises/migrations/0019_license_author.py
new file mode 100644
index 000000000..46f271842
--- /dev/null
+++ b/wger/exercises/migrations/0019_license_author.py
@@ -0,0 +1,90 @@
+# -*- 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):
+ '''
+ Move the content of the 'user' field to 'license_author'
+ '''
+ for exercise in orm.Exercise.objects.all():
+ exercise.license_author = exercise.user
+ exercise.save()
+
+
+ def backwards(self, orm):
+ '''
+ Move the content of the 'license_author' field to 'user'
+ '''
+ for exercise in orm.Exercise.objects.all():
+ exercise.user = exercise.license_author
+ exercise.save()
+
+ 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'}),
+ 'user': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'})
+ },
+ 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 = True
diff --git a/wger/exercises/migrations/0020_auto__del_field_exercise_user.py b/wger/exercises/migrations/0020_auto__del_field_exercise_user.py
new file mode 100644
index 000000000..c3428fbc6
--- /dev/null
+++ b/wger/exercises/migrations/0020_auto__del_field_exercise_user.py
@@ -0,0 +1,84 @@
+# -*- 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):
+ # Deleting field 'Exercise.user'
+ db.delete_column(u'exercises_exercise', 'user')
+
+
+ def backwards(self, orm):
+ # Adding field 'Exercise.user'
+ db.add_column(u'exercises_exercise', 'user',
+ self.gf('django.db.models.fields.CharField')(max_length=100, null=True, blank=True),
+ keep_default=False)
+
+
+ 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']
\ No newline at end of file
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index df1ca886c..e42750f46 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -175,9 +175,6 @@ class Exercise(AbstractLicenseModel, models.Model):
'''Equipment needed by this exercise'''
# Non-editable fields
- user = models.CharField(verbose_name=_('User'), null=True, blank=True, max_length=100)
- '''The user that submitted the exercise'''
-
status = models.CharField(max_length=2,
choices=EXERCISE_STATUS,
default=EXERCISE_STATUS_PENDING,
@@ -292,7 +289,7 @@ class Exercise(AbstractLicenseModel, models.Model):
user = User.objects.get(username=self.user)
except User.DoesNotExist:
return
- if self.user and user.email:
+ if self.license_author and user.email:
translation.activate(user.userprofile.notification_language.short_name)
url = request.build_absolute_uri(self.get_absolute_url())
subject = _('Exercise was successfully added to the general database')
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index b30b8e1c7..c962f361c 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -339,6 +339,6 @@ weight_log_chart({{json|safe}}, "{{svg_uuid}}", "{{reps}}")
</p>
{% endif %}
-{% license_sidebar exercise.license author %}
+{% license_sidebar exercise.license exercise.license_author %}
{% endblock %}
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index f2808d069..529f8309e 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -257,10 +257,10 @@ class ExercisesTestCase(WorkoutManagerTestCase):
# Exercise was saved
exercise = Exercise.objects.get(pk=exercise_id)
if admin:
- self.assertEqual(exercise.user, 'admin')
+ self.assertEqual(exercise.license_author, 'wger.de')
self.assertEqual(exercise.status, Exercise.EXERCISE_STATUS_ADMIN)
else:
- self.assertEqual(exercise.user, 'test')
+ self.assertEqual(exercise.license_author, 'test')
self.assertEqual(exercise.status, Exercise.EXERCISE_STATUS_PENDING)
response = self.client.get(reverse('exercise-view', kwargs={'id': exercise_id}))
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index 1cda19e25..3d43af19d 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -111,7 +111,7 @@ class AddExerciseImageTestCase(WorkoutManagerAddTestCase):
user_fail = False
data = {'is_main': True,
'image': open('wger/exercises/tests/protestschwein.jpg', 'rb'),
- 'license': '1'}
+ 'license': 1}
class EditExerciseImageTestCase(WorkoutManagerEditTestCase):
@@ -123,7 +123,7 @@ class EditExerciseImageTestCase(WorkoutManagerEditTestCase):
url = 'exerciseimage-edit'
pk = 2
data = {'is_main': True,
- 'license': '1'}
+ 'license': 1}
class DeleteExerciseImageTestCase(WorkoutManagerDeleteTestCase):
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 05efcc99d..366c5cdef 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -137,8 +137,6 @@ def view(request, id, slug=None):
template_data['json'] = chart_data
template_data['svg_uuid'] = str(uuid.uuid4())
template_data['reps'] = _("Reps")
- template_data['author'] = exercise.user if not exercise.license_author \
- else exercise.license_author
return render(request, 'exercise/view.html', template_data)
@@ -226,11 +224,17 @@ class ExerciseAddView(ExercisesEditAddView, CreateView, WgerPermissionMixin):
If admin, set appropriate status
'''
- form.instance.user = self.request.user.username
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 = _('''The user {0} submitted a new exercise "{1}".'''.format(
self.request.user.username, form.instance.name))