From 0b12914242f5c4def3cc86d44e370c6ad44920db Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Tue, 24 Jan 2017 15:47:17 +0100
Subject: Correction de la regex pour trouver les semaines

---
 urls.py  | 4 ++--
 views.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/urls.py b/urls.py
index 95e51a5..a8369e8 100644
--- a/urls.py
+++ b/urls.py
@@ -4,8 +4,8 @@ from . import views
 
 urlpatterns = [
     url(r"^$", views.index, name="index"),
-    url(r"^(?P<timetable_slug>[-\w]+)/(?P<year>[0-9]{4})/(?P<week>[0-53]{1,2})/(?P<group_slug>[-\w]+)/$", views.timetable, name="timetable"),
-    url(r"^(?P<timetable_slug>[-\w]+)/(?P<year>[0-9]{4})/(?P<week>[0-53]{1,2})/(?P<group_slug>[-\w]+)/subscribe$", views.subscribe, name="subscribe"),
+    url(r"^(?P<timetable_slug>[-\w]+)/(?P<year>[0-9]{4})/(?P<week>[0-4]?[0-9]|5[0-3])/(?P<group_slug>[-\w]+)/$", views.timetable, name="timetable"),
+    url(r"^(?P<timetable_slug>[-\w]+)/(?P<year>[0-9]{4})/(?P<week>[0-4]?[0-9]|5[0-3])/(?P<group_slug>[-\w]+)/subscribe$", views.subscribe, name="subscribe"),
     url(r"^subscriptions/confirm/(?P<token>[0-9a-f]{40})$", views.confirm_subscription, name="confirm"),
     url(r"^subscriptions/cancel/(?P<token>[0-9a-f]{40})$", views.cancel_subscription, name="cancel"),
 ]
diff --git a/views.py b/views.py
index 92e6dc9..424e355 100644
--- a/views.py
+++ b/views.py
@@ -41,7 +41,7 @@ def timetable(request, timetable_slug, year, week, group_slug):
 
     grouped_courses = group_courses(courses)
 
-    return render(request, "timetable.html", {"timetable": timetable, "group": group, "courses": grouped_courses, "last_update": last_update.date, "year": year, "week": week})
+    return render(request, "timetable.html", {"timetable": timetable, "group": group, "courses": grouped_courses, "last_update": last_update.date, "year": year, "week": int(week)})
 
 def subscribe(request, timetable_slug, year, week, group_slug):
     group = get_object_or_404(Group, slug=group_slug)
@@ -52,7 +52,7 @@ def subscribe(request, timetable_slug, year, week, group_slug):
             subscription = Subscription(email=request.POST["email"], group=group)
             subscription.save()
 
-            return redirect("timetable", timetable_slug=timetable_slug, year=year, week=week, group_slug=group_slug)
+            return redirect("timetable", timetable_slug=timetable_slug, year=year, week=int(week), group_slug=group_slug)
     else:
         form = SubscribeForm()
 
-- 
cgit v1.2.1