From 733f2b620c996c6145c7221ac352a018d4bb427d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Fri, 15 Nov 2013 10:09:20 +0100 Subject: [PATCH 1/1] Fix missing links to competencies catalogue in a lesson view --- curriculum/models.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/curriculum/models.py b/curriculum/models.py index a3e2280..b53d2ca 100644 --- a/curriculum/models.py +++ b/curriculum/models.py @@ -2,7 +2,7 @@ import re from django.core.urlresolvers import reverse from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _, get_language from fnpdjango.utils.models.translation import add_translatable class Section(models.Model): @@ -54,10 +54,11 @@ class Competence(models.Model): def from_text(cls, text): """Tries to return a Competence or a Section.""" parts = re.split(ur'[-\u2013]', text, 1) + lookup_field_name = 'name_%s__iexact' % get_language() if len(parts) == 1: - return Section.objects.get(name__iexact=text.strip()) + return Section.objects.get(**{lookup_field_name: text.strip()}) else: - return cls.objects.get(name__iexact=parts[1].strip()) + return cls.objects.get(**{lookup_field_name: parts[1].strip()}) add_translatable(Competence, { 'name': models.CharField(_('name'), max_length=255, default = '') -- 2.20.1