From c618a8612370b94b89180527cb28b703a8201668 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Mon, 4 Sep 2017 16:47:49 +0200 Subject: Utilisation de l’apostrophe typographique et de l’espace insécable. --- views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views.py') diff --git a/views.py b/views.py index 22c08ac..9365695 100644 --- a/views.py +++ b/views.py @@ -74,7 +74,7 @@ def subscribe(request, timetable_slug, group_slug, year, week): template = loader.get_template("mail/mail_confirm.txt") context = Context({"group": group, "admins": settings.ADMINS, "token": subscription.token, "domain": settings.DEFAULT_DOMAIN}) - send_mail("Confirmation de l'abonnemenent", template.render(context), settings.DEFAULT_FROM_EMAIL, [request.POST["email"]]) + send_mail("Confirmation de l’abonnemenent", template.render(context), settings.DEFAULT_FROM_EMAIL, [request.POST["email"]]) return redirect("timetable", timetable_slug=timetable_slug, group_slug=group_slug, year=year, week=int(week)) else: -- cgit v1.2.1 From a6c5bfa4796081747e04ae4047007d5c8ad23164 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Mon, 4 Sep 2017 18:35:26 +0200 Subject: Ajout d’un champ « groupe parent » au modèle Group pour n’afficher que les groupes qui n’ont pas d’enfants. Par exemple, le groupe TPA21 aura comme parent le groupe TDA2, qui aura le groupe CMA comme parent. Pour l’instant, le parseur d’emploi du temps ne créée pas de telles relations. --- views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'views.py') diff --git a/views.py b/views.py index 9365695..176f174 100644 --- a/views.py +++ b/views.py @@ -24,8 +24,8 @@ from .models import Timetable, LastUpdate, Group, Subscription, Course from .utils import get_current_week, get_week, group_courses def index(request): - timetables = Timetable.objects.all().order_by("name") - groups = Group.objects.filter(tp__isnull=False).order_by("name") + timetables = Timetable.objects.order_by("name") + groups = Group.objects.get_relevant_groups().order_by("name") year, week = get_current_week() start, _ = get_week(year, week) -- cgit v1.2.1