forked from DGNum/gestioCOF
Nettoyage
Modifications dans le sens de PEP8 dans les fichiers qu'on utilise
This commit is contained in:
parent
4c20b17b4e
commit
d4e7cd698e
|
@ -15,7 +15,6 @@ from django.contrib.auth.models import User
|
||||||
from django.contrib.auth.admin import UserAdmin
|
from django.contrib.auth.admin import UserAdmin
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.utils.safestring import mark_safe
|
from django.utils.safestring import mark_safe
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
import django.utils.six as six
|
import django.utils.six as six
|
||||||
|
|
||||||
import autocomplete_light
|
import autocomplete_light
|
||||||
|
@ -191,7 +190,8 @@ else:
|
||||||
|
|
||||||
class EventRegistrationAdmin(admin.ModelAdmin):
|
class EventRegistrationAdmin(admin.ModelAdmin):
|
||||||
form = autocomplete_light.modelform_factory(EventRegistration, exclude=[])
|
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',)
|
list_filter = ('paid',)
|
||||||
search_fields = ('user__username', 'user__first_name', 'user__last_name',
|
search_fields = ('user__username', 'user__first_name', 'user__last_name',
|
||||||
'user__email', 'event__title')
|
'user__email', 'event__title')
|
||||||
|
|
|
@ -361,7 +361,7 @@ def inscription(request):
|
||||||
abilities = PetitCoursAbility.objects \
|
abilities = PetitCoursAbility.objects \
|
||||||
.filter(user=request.user).all()
|
.filter(user=request.user).all()
|
||||||
for ability in abilities:
|
for ability in abilities:
|
||||||
counter = _get_attrib_counter(ability.user, ability.matiere)
|
_get_attrib_counter(ability.user, ability.matiere)
|
||||||
unlock_tables()
|
unlock_tables()
|
||||||
success = True
|
success = True
|
||||||
formset = MatieresFormSet(instance=request.user)
|
formset = MatieresFormSet(instance=request.user)
|
||||||
|
|
|
@ -11,6 +11,7 @@ import re
|
||||||
|
|
||||||
register = template.Library()
|
register = template.Library()
|
||||||
|
|
||||||
|
|
||||||
@register.filter
|
@register.filter
|
||||||
def key(d, key_name):
|
def key(d, key_name):
|
||||||
try:
|
try:
|
||||||
|
@ -20,19 +21,25 @@ def key(d, key_name):
|
||||||
value = settings.TEMPLATE_STRING_IF_INVALID
|
value = settings.TEMPLATE_STRING_IF_INVALID
|
||||||
return value
|
return value
|
||||||
|
|
||||||
|
|
||||||
def highlight_text(text, q):
|
def highlight_text(text, q):
|
||||||
q2 = "|".join(q.split())
|
q2 = "|".join(q.split())
|
||||||
pattern = re.compile(r"(?P<filter>%s)" % q2, re.IGNORECASE)
|
pattern = re.compile(r"(?P<filter>%s)" % q2, re.IGNORECASE)
|
||||||
return mark_safe(re.sub(pattern, r"<span class='highlight'>\g<filter></span>", text))
|
return mark_safe(re.sub(pattern,
|
||||||
|
r"<span class='highlight'>\g<filter></span>",
|
||||||
|
text))
|
||||||
|
|
||||||
|
|
||||||
@register.filter
|
@register.filter
|
||||||
def highlight_user(user, q):
|
def highlight_user(user, q):
|
||||||
if user.first_name and user.last_name:
|
if user.first_name and user.last_name:
|
||||||
text = "%s %s (<tt>%s</tt>)" % (user.first_name, user.last_name, user.username)
|
text = "%s %s (<tt>%s</tt>)" % (user.first_name, user.last_name,
|
||||||
|
user.username)
|
||||||
else:
|
else:
|
||||||
text = user.username
|
text = user.username
|
||||||
return highlight_text(text, q)
|
return highlight_text(text, q)
|
||||||
|
|
||||||
|
|
||||||
@register.filter
|
@register.filter
|
||||||
def highlight_clipper(clipper, q):
|
def highlight_clipper(clipper, q):
|
||||||
if clipper.fullname:
|
if clipper.fullname:
|
||||||
|
@ -40,4 +47,3 @@ def highlight_clipper(clipper, q):
|
||||||
else:
|
else:
|
||||||
text = clipper.username
|
text = clipper.username
|
||||||
return highlight_text(text, q)
|
return highlight_text(text, q)
|
||||||
|
|
||||||
|
|
|
@ -458,7 +458,8 @@ def registration(request):
|
||||||
(current_registration, created_reg) = \
|
(current_registration, created_reg) = \
|
||||||
EventRegistration.objects.get_or_create(user=member,
|
EventRegistration.objects.get_or_create(user=member,
|
||||||
event=form.event)
|
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.options = all_choices
|
||||||
current_registration.paid = \
|
current_registration.paid = \
|
||||||
(form.cleaned_data['status'] == 'paid')
|
(form.cleaned_data['status'] == 'paid')
|
||||||
|
|
Loading…
Reference in a new issue