Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add a minimum length for exercise descriptions

Roland Geidere959f93ffe23
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 019c3619b..b8b67ef90 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -26,6 +26,7 @@ from django.utils import translation
from django.core.urlresolvers import reverse
from django.core import mail
from django.core.cache import cache
+from django.core.validators import MinLengthValidator
from django.db.models.signals import pre_save
from django.db.models.signals import post_delete
from easy_thumbnails.files import get_thumbnailer
@@ -159,7 +160,8 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
category = models.ForeignKey(ExerciseCategory,
verbose_name=_('Category'))
description = models.TextField(max_length=2000,
- verbose_name=_('Description'))
+ verbose_name=_('Description'),
+ validators=[MinLengthValidator(40)])
'''Description on how to perform the exercise'''
name = models.CharField(max_length=200,
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index d9c8252c6..05a04ec57 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -318,7 +318,7 @@ $(document).ready(function() {
{% if perms.exercises %}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'exercise-edit' exercise.id %}" {% auto_link_css flavour "wger-modal-dialog" %}>
+ <a href="{% url 'exercise-edit' exercise.id %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/edit.svg' %}"
width="32"
height="32"
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index b3da67ffa..63094f63e 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -239,11 +239,12 @@ class ExercisesTestCase(WorkoutManagerTestCase):
# Add an exercise
count_before = Exercise.objects.count()
+ description = 'a nice, long and accurate description for the exercise'
response = self.client.post(reverse('exercise-add'),
{'category': 2,
'name': 'my test exercise',
'license': 1,
- 'description': 'a nice, long and accurate description',
+ 'description': description,
'muscles': [1, 2]})
count_after = Exercise.objects.count()
self.assertEqual(response.status_code, 302)