Self hosted FLOSS fitness/workout, nutrition and weight tracker
Use License model to explicitly set a license for exercises
Roland Geider954ef6dbbd88
diff --git a/wger/core/fixtures/licenses.json b/wger/core/fixtures/licenses.jsonnew file mode 100644index 000000000..187c465d8--- /dev/null+++ b/wger/core/fixtures/licenses.json@@ -0,0 +1,29 @@+[+ {+ "pk": 1,+ "model": "core.license",+ "fields": {+ "url": "https://creativecommons.org/licenses/by-sa/3.0/deed.en",+ "full_name": " Creative Commons Attribution Share Alike 3",+ "short_name": "CC-BY-SA 3"+ }+ },+ {+ "pk": 2,+ "model": "core.license",+ "fields": {+ "url": "https://creativecommons.org/licenses/by-sa/4.0/deed.en",+ "full_name": "Creative Commons Attribution Share Alike 4",+ "short_name": "CC-BY-SA 4"+ }+ },+ {+ "pk": 3,+ "model": "core.license",+ "fields": {+ "url": "http://creativecommons.org/publicdomain/zero/1.0/",+ "full_name": "Creative Commons Public Domain 1.0",+ "short_name": "CC0"+ }+ }+]\ No newline at end of filediff --git a/wger/core/templates/mobile/navigation.html b/wger/core/templates/mobile/navigation.htmlindex c606e11f4..393684657 100644--- a/wger/core/templates/mobile/navigation.html+++ b/wger/core/templates/mobile/navigation.html@@ -109,6 +109,7 @@{% if perms.exercises %}<li data-role="list-divider">{% trans "Administration" %}</li><li><a href="{% url 'config:language-overview' %}">{% trans "Languages" %} </a></li>+ <li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>{% endif %}</ul></div>diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.htmlindex 1cb638eb8..5d8f2021d 100644--- a/wger/core/templates/navigation.html+++ b/wger/core/templates/navigation.html@@ -126,6 +126,7 @@<li class="divider"></li><li class="nav-header">{% trans "Administration" %}</li><li><a href="{% url 'config:language-overview' %}">{% trans "Languages" %} </a></li>+ <li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>{% endif %}{% endcache %}</ul>diff --git a/wger/exercises/api/resources.py b/wger/exercises/api/resources.pyindex 630933def..f3875f945 100644--- a/wger/exercises/api/resources.py+++ b/wger/exercises/api/resources.py@@ -21,6 +21,8 @@ from easy_thumbnails.alias import aliasesfrom easy_thumbnails.files import get_thumbnailerfrom wger.core.api.resources import LanguageResource+from wger.core.api.resources import LicenseResource+from wger.exercises.models import Exercisefrom wger.exercises.models import ExerciseCategoryfrom wger.exercises.models import ExerciseComment@@ -42,6 +44,8 @@ class ExerciseResource(ModelResource):equipment = fields.ToManyField('wger.exercises.api.resources.EquipmentResource','equipment')language = fields.ToOneField(LanguageResource, 'language')+ license = fields.ToOneField(LicenseResource, 'license')+creation_date = fields.DateField(attribute='creation_date', null=True)class Meta:diff --git a/wger/exercises/migrations/0016_auto__add_field_exercise_license.py b/wger/exercises/migrations/0016_auto__add_field_exercise_license.pynew file mode 100644index 000000000..8011d5b80--- /dev/null+++ b/wger/exercises/migrations/0016_auto__add_field_exercise_license.py@@ -0,0 +1,93 @@+# -*- 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 'Exercise.license'+ db.add_column(u'exercises_exercise', 'license',+ self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['core.License']),+ keep_default=False)++ # Adding field 'Exercise.license_author'+ db.add_column(u'exercises_exercise', 'license_author',+ self.gf('django.db.models.fields.CharField')(max_length=50, null=True, blank=True),+ keep_default=False)+++ def backwards(self, orm):+ # Deleting field 'Exercise.license'+ db.delete_column(u'exercises_exercise', 'license_id')++ # Deleting field 'Exercise.license_author'+ db.delete_column(u'exercises_exercise', 'license_author')+++ 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.CharField', [], {'default': "'1'", 'max_length': '2'}),+ '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 filediff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex c521b87b5..ab4782e98 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -33,6 +33,7 @@ from easy_thumbnails.signals import saved_filefrom easy_thumbnails.signal_handlers import generate_aliases_globalfrom wger.core.models import Language+from wger.core.models import Licensefrom wger.utils.constants import EMAIL_FROMfrom wger.utils.cache import delete_template_fragment_cache, reset_workout_canonical_formfrom wger.utils.cache import cache_mapper@@ -173,6 +174,20 @@ class Exercise(models.Model):blank=True)'''Equipment needed by this exercise'''+ license = models.ForeignKey(License,+ verbose_name=_('License'),+ default=1)+ '''The exercise's license'''++ license_author = models.CharField(verbose_name=_('Author'),+ max_length=50,+ blank=True,+ null=True,+ help_text=_('If you are not the author of the image, enter '+ 'the name here. This is needed for some licenses '+ 'e.g. the CC-BY-SA.'))+ '''The author if it is not the uploader'''+# Non-editable fieldsuser = models.CharField(verbose_name=_('User'), null=True, blank=True, max_length=100)'''The user that submitted the exercise'''@@ -194,8 +209,6 @@ class Exercise(models.Model):## Django methods#-- # Metaclass to set some other propertiesclass Meta:ordering = ["name", ]diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.htmlindex 09559ea3b..b30b8e1c7 100644--- a/wger/exercises/templates/exercise/view.html+++ b/wger/exercises/templates/exercise/view.html@@ -149,45 +149,6 @@ included in the database.{% endblocktrans %}{% if images %}<h3>{% trans "Images" %}</h3>--<!--- {% with main_image=images|first %}- <div class="image-gallery" style="width:450px;margin-left:auto;margin-right:auto;">- <div class="image-box" style="width:400px;padding-bottom:340px;">- <div class="boxInner">- <img src="{{ main_image.image|thumbnail_url:'medium' }}"- alt=""- class="gallery-image">-- <div class="titleBox">- <a href="{{ main_image.image.url }}"- target="_blank"- class=" no-hover">- {% trans "Download" %}</a>- {% if perms.exercises.change_exerciseimage %}- |- <a href="{% url 'exerciseimage-delete' exercise.pk main_image.pk %}"- class="modal-dialog no-hover">- {% trans 'Delete' %}</a> |- <a href="{% url 'exerciseimage-edit' main_image.pk %}"- class="no-hover">- {% trans 'Edit' %}</a>- {% endif %}-- <br>- {{main_image.get_license_display}}- {% if main_image.license_author %}- – {{main_image.license_author}}- {% endif %}-- </div>- </div>- </div>- </div>- {% endwith %}--->--<div class="image-gallery">{% with other_images=images %}{% for image in other_images %}@@ -378,6 +339,6 @@ weight_log_chart({{json|safe}}, "{{svg_uuid}}", "{{reps}}")</p>{% endif %}-{% cc_by_sa_sidebar language %}+{% license_sidebar exercise.license author %}{% endblock %}diff --git a/wger/exercises/templates/mobile/exercise/view.html b/wger/exercises/templates/mobile/exercise/view.htmlindex 4e028db3c..a2c7a8196 100644--- a/wger/exercises/templates/mobile/exercise/view.html+++ b/wger/exercises/templates/mobile/exercise/view.html@@ -352,6 +352,6 @@ $(document).ready(function() {<hr>{% endif %}-{% cc_by_sa_sidebar language %}+{% license_sidebar exercise.license exercise.license_author %}{% endblock %}diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.pyindex bdcd966fa..f2808d069 100644--- a/wger/exercises/tests/test_exercise.py+++ b/wger/exercises/tests/test_exercise.py@@ -208,6 +208,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):response = self.client.post(reverse('exercise-add'),{'category': 2,'name': 'my test exercise',+ 'license': 1,'muscles': [1, 2]})count_after = Exercise.objects.count()self.assertIn(response.status_code, STATUS_CODES_FAIL)@@ -242,6 +243,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):response = self.client.post(reverse('exercise-add'),{'category': 2,'name': 'my test exercise',+ 'license': 1,'description': 'a nice, long and accurate description','muscles': [1, 2]})count_after = Exercise.objects.count()@@ -274,6 +276,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):response = self.client.post(reverse('exercise-add'),{'category': 111,'name': 'my test exercise',+ 'license': 1,'muscles': [1, 2]})self.assertTrue(response.context['form'].errors['category'])@@ -281,6 +284,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):response = self.client.post(reverse('exercise-edit', kwargs={'pk': '1'}),{'category': 111,'name': 'my test exercise',+ 'license': 1,'muscles': [1, 2]})if admin:self.assertTrue(response.context['form'].errors['category'])@@ -291,6 +295,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):response = self.client.post(reverse('exercise-add'),{'category': 1,'name': 'my test exercise',+ 'license': 1,'muscles': []})self.assertFalse(response.context['form'].errors.get('muscles'))@@ -298,6 +303,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):response = self.client.post(reverse('exercise-edit', kwargs={'pk': '1'}),{'category': 1,'name': 'my test exercise',+ 'license': 1,'muscles': []})if admin:self.assertFalse(response.context['form'].errors.get('muscles'))diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex f909e1f42..05efcc99d 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -137,8 +137,9 @@ def view(request, id, slug=None):template_data['json'] = chart_datatemplate_data['svg_uuid'] = str(uuid.uuid4())template_data['reps'] = _("Reps")+ template_data['author'] = exercise.user if not exercise.license_author \+ else exercise.license_author- # Renderreturn render(request, 'exercise/view.html', template_data)@@ -155,7 +156,9 @@ class ExercisesEditAddView(WgerFormMixin):'description','muscles','muscles_secondary',- 'equipment']+ 'equipment',+ 'license',+ 'license_author']title = ugettext_lazy('Add exercise')custom_js = 'init_tinymce();'diff --git a/wger/main.py b/wger/main.pyindex 944be21ed..6ed748a86 100755--- a/wger/main.py+++ b/wger/main.py@@ -384,6 +384,7 @@ def load_fixtures():path = os.path.join(current_dir, 'core', 'fixtures/')call_command("loaddata", path + "users")call_command("loaddata", path + "languages")+ call_command("loaddata", path + "licenses")call_command("loaddata", path + "days_of_week")# Configdiff --git a/wger/manager/templates/tags/cc-by-sa-sidebar.html b/wger/manager/templates/tags/cc-by-sa-sidebar.htmldeleted file mode 100644index 69141d631..000000000--- a/wger/manager/templates/tags/cc-by-sa-sidebar.html+++ /dev/null@@ -1,18 +0,0 @@-{% load i18n %}-{% load staticfiles %}--<h3>{% trans "Free license" %}</h3>--<p>-<img src="{% static 'images/cc-by-sa.svg' %}"- width="88"- height="31"- alt="{% trans 'CC-BY-SA' %}"- title="{% trans 'CC-BY-SA' %}"- class="float-left">-- {% blocktrans %}This content is available under a Creative Commons-Attribution Share-Alike license.{% endblocktrans %}-{% trans "Link:" %} <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.{{language.short_name}}">CC-BY-SA-3.0</a>-</p>diff --git a/wger/manager/templates/tags/license-sidebar.html b/wger/manager/templates/tags/license-sidebar.htmlnew file mode 100644index 000000000..57cf7b516--- /dev/null+++ b/wger/manager/templates/tags/license-sidebar.html@@ -0,0 +1,19 @@+{% load i18n %}+{% load staticfiles %}++<h3>{% trans "Free license" %}</h3>++<p>+ {% trans "This content is available under the following license:" %}+ <strong>{{license}}</strong>+ {% if author %}+ – {{author}}+ {% endif %}++ {% if license.url %}+ <br>+ <a rel="license" href="{{license.url}}">{% trans "Click here for more information" %}</a>+ {% endif %}+++</p>diff --git a/wger/manager/templatetags/wger_extras.py b/wger/manager/templatetags/wger_extras.pyindex 156c87252..c2bec7fa7 100644--- a/wger/manager/templatetags/wger_extras.py+++ b/wger/manager/templatetags/wger_extras.py@@ -95,13 +95,14 @@ def yaml_form_field(field, css_class='ym-fbox-text'):'css_class': css_class}[email protected]_tag('tags/cc-by-sa-sidebar.html')-def cc_by_sa_sidebar(language):[email protected]_tag('tags/license-sidebar.html')+def license_sidebar(license, author=None):'''- Renders the Creative Commons license notice+ Renders the license notice for exercises'''- return {'language': language}+ return {'license': license,+ 'author': author}@register.inclusion_tag('tags/language_select.html', takes_context=True)