diff --git a/templates/peoples/gymnasts/list_routine.html b/templates/peoples/gymnasts/list_routine.html index 5ac659a37b..4240d062b3 100644 --- a/templates/peoples/gymnasts/list_routine.html +++ b/templates/peoples/gymnasts/list_routine.html @@ -29,7 +29,7 @@ {{ ghr.get_routine_type_display }} - {{ ghr.routine.longLabel }} + {{ ghr.routine.long_label }} {{ ghr.datebegin | date:"d-m-Y"}} {% if ghr.dateend %}{{ ghr.dateend | date:"d F Y" }}{% else %}… to now.{% endif %} {{ ghr.routine.difficulty }} diff --git a/ultron/objective/models.py b/ultron/objective/models.py index be29d0a5b2..2bcba99f46 100644 --- a/ultron/objective/models.py +++ b/ultron/objective/models.py @@ -202,7 +202,7 @@ class Routine(Educative): Renvoie True si la série contient au moins un tomber de base, False sinon. """ return self.skill_links.filter( - skill__landing__longLabel__in=["Assis", "Dos", "Ventre"] + skill__landing__long_label__in=["Assis", "Dos", "Ventre"] ).exists() def contains_basic_salto(self): diff --git a/ultron/objective/views.py b/ultron/objective/views.py index b1074edf76..19dcdb5969 100644 --- a/ultron/objective/views.py +++ b/ultron/objective/views.py @@ -48,7 +48,7 @@ def skill_listing(request, field=None, expression=None, value=None, level=None): if pattern: skill_list = Skill.objects.filter( - Q(longLabel__icontains=pattern) | Q(shortLabel__icontains=pattern) + Q(long_label__icontains=pattern) | Q(short_label__icontains=pattern) ) elif field and expression and value: kwargs = {"{0}__{1}".format(field, expression): value} @@ -105,7 +105,7 @@ def routine_listing(request): pattern = request.GET.get("pattern", None) if pattern: routine_list = Routine.objects.filter( - Q(longLabel__icontains=pattern) | Q(shortLabel__icontains=pattern) + Q(long_label__icontains=pattern) | Q(short_label__icontains=pattern) ) else: routine_list = Routine.objects.all()