cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_revente

Browse source
This commit is contained in:
Ludovic Stephan 2016-07-28 23:06:01 +02:00
commit af524a3081
8 changed files with 42 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gestioncof/admin.py
View file

@ -5,13 +5,16 @@ from __future__ import print_function
from __future__ import unicode_literals
from django.contrib import admin
from gestioncof.models import *
from gestioncof.petits_cours_models import *
from gestioncof.models import SurveyQuestionAnswer, SurveyQuestion, \
CofProfile, EventOption, EventOptionChoice, Event, Club, CustomMail, \
Survey, EventCommentField, EventRegistration
from gestioncof.petits_cours_models import PetitCoursDemande, \
PetitCoursSubject, PetitCoursAbility, PetitCoursAttribution, \
PetitCoursAttributionCounter
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
@ -187,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')

2
gestioncof/models.py
View file

@ -11,7 +11,7 @@ from django.utils.encoding import python_2_unicode_compatible
import django.utils.six as six
from django.db.models.signals import post_save
from gestioncof.petits_cours_models import *
from gestioncof.petits_cours_models import choices_length
OCCUPATION_CHOICES = (
('exterieur', _("Extérieur")),

6
gestioncof/petits_cours_views.py
View file

@ -20,7 +20,9 @@ from django.contrib.auth.decorators import login_required
from django.db.models import Min
from gestioncof.models import CofProfile
from gestioncof.petits_cours_models import *
from gestioncof.petits_cours_models import PetitCoursDemande, \
PetitCoursAttribution, PetitCoursAttributionCounter, PetitCoursAbility, \
PetitCoursSubject
from gestioncof.decorators import buro_required
from gestioncof.shared import lock_table, unlock_tables
@ -359,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)

3
gestioncof/templates/login.html
View file

@ -10,7 +10,8 @@
<p class="error">Identifiants incorrects.</p>
{% endif %}
<form method="post" action="{% url 'gestioncof.views.login_ext' %}">
<form method="post"
action="{% url 'gestioncof.views.login_ext' %}?next={{ next|urlencode }}">
{% csrf_token %}
<table>
<tr>

6
gestioncof/templates/login_switch.html
View file

@ -3,10 +3,12 @@
{% block content %}
<div id="main-login-container">
<div id="main-login">
<a id="login_clipper" href="{% url 'django_cas_ng.views.login' %}">
<a id="login_clipper"
href="{% url 'django_cas_ng.views.login' %}?next={{ next|urlencode }}">
Compte clipper
</a>
<a id="login_outsider" href="{% url 'gestioncof.views.login_ext' %}">
<a id="login_outsider"
href="{% url 'gestioncof.views.login_ext' %}?next={{ next|urlencode }}">
Extérieur
</a>
<div class="spacer"></div>

12
gestioncof/templatetags/utils.py
View file

@ -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<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
def highlight_user(user, q):
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:
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)

16
gestioncof/views.py
View file

@ -43,7 +43,10 @@ def home(request):
def login(request):
if request.user.is_authenticated():
return redirect("gestioncof.views.home")
return render(request, "login_switch.html", {})
context = {}
if request.method == "GET" and 'next' in request.GET:
context['next'] = request.GET['next']
return render(request, "login_switch.html", context)
def login_ext(request):
@ -60,7 +63,13 @@ def login_ext(request):
{"error_type": "no_password"})
except User.DoesNotExist:
pass
return django_login_view(request, template_name='login.html')
context = {}
if request.method == "GET" and 'next' in request.GET:
context['next'] = request.GET['next']
if request.method == "POST" and 'next' in request.POST:
context['next'] = request.POST['next']
return django_login_view(request, template_name='login.html',
extra_context=context)
@login_required
@ -458,7 +467,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')