diff options
| -rw-r--r-- | urls.py | 4 | ||||
| -rw-r--r-- | views.py | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -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"), ] @@ -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() |