diff --git a/gestioncof/admin.py b/gestioncof/admin.py index 702a3089..342317f3 100644 --- a/gestioncof/admin.py +++ b/gestioncof/admin.py @@ -15,7 +15,6 @@ from django.contrib.auth.models import User from django.contrib.auth.admin import UserAdmin from django.core.urlresolvers import reverse from django.utils.safestring import mark_safe -from django.utils.translation import ugettext_lazy as _ import django.utils.six as six import autocomplete_light @@ -191,7 +190,8 @@ else: class EventRegistrationAdmin(admin.ModelAdmin): form = autocomplete_light.modelform_factory(EventRegistration, exclude=[]) - list_display = ('__unicode__' if six.PY2 else '__str__', 'event', 'user', 'paid') + list_display = ('__unicode__' if six.PY2 else '__str__', 'event', 'user', + 'paid') list_filter = ('paid',) search_fields = ('user__username', 'user__first_name', 'user__last_name', 'user__email', 'event__title') diff --git a/gestioncof/petits_cours_models.py b/gestioncof/petits_cours_models.py index e9c2943d..4428b78c 100644 --- a/gestioncof/petits_cours_models.py +++ b/gestioncof/petits_cours_models.py @@ -53,7 +53,7 @@ class PetitCoursAbility(models.Model): def __str__(self): return "%s - %s - %s" % (self.user.username, - self.matiere, self.niveau) + self.matiere, self.niveau) @python_2_unicode_compatible diff --git a/gestioncof/petits_cours_views.py b/gestioncof/petits_cours_views.py index b87d4ea2..7d54766e 100644 --- a/gestioncof/petits_cours_views.py +++ b/gestioncof/petits_cours_views.py @@ -361,7 +361,7 @@ def inscription(request): abilities = PetitCoursAbility.objects \ .filter(user=request.user).all() for ability in abilities: - counter = _get_attrib_counter(ability.user, ability.matiere) + _get_attrib_counter(ability.user, ability.matiere) unlock_tables() success = True formset = MatieresFormSet(instance=request.user) diff --git a/gestioncof/templatetags/utils.py b/gestioncof/templatetags/utils.py index 223f208b..16a1f4e3 100644 --- a/gestioncof/templatetags/utils.py +++ b/gestioncof/templatetags/utils.py @@ -11,6 +11,7 @@ import re register = template.Library() + @register.filter def key(d, key_name): try: @@ -20,19 +21,25 @@ def key(d, key_name): value = settings.TEMPLATE_STRING_IF_INVALID return value + def highlight_text(text, q): q2 = "|".join(q.split()) pattern = re.compile(r"(?P%s)" % q2, re.IGNORECASE) - return mark_safe(re.sub(pattern, r"\g", text)) + return mark_safe(re.sub(pattern, + r"\g", + text)) + @register.filter def highlight_user(user, q): if user.first_name and user.last_name: - text = "%s %s (%s)" % (user.first_name, user.last_name, user.username) + text = "%s %s (%s)" % (user.first_name, user.last_name, + user.username) else: text = user.username return highlight_text(text, q) + @register.filter def highlight_clipper(clipper, q): if clipper.fullname: @@ -40,4 +47,3 @@ def highlight_clipper(clipper, q): else: text = clipper.username return highlight_text(text, q) - diff --git a/gestioncof/views.py b/gestioncof/views.py index 39eba050..e2f59d44 100644 --- a/gestioncof/views.py +++ b/gestioncof/views.py @@ -458,7 +458,8 @@ def registration(request): (current_registration, created_reg) = \ EventRegistration.objects.get_or_create(user=member, event=form.event) - update_event_form_comments(form.event, form, current_registration) + update_event_form_comments(form.event, form, + current_registration) current_registration.options = all_choices current_registration.paid = \ (form.cleaned_data['status'] == 'paid')