summaryrefslogtreecommitdiff
path: root/helsinki
diff options
context:
space:
mode:
authorJohannes Raggam <raggam-nl@adm.at>2011-04-08 13:50:51 (GMT)
committerJohannes Raggam <raggam-nl@adm.at>2011-04-08 13:50:51 (GMT)
commit41d65a62e0d9ebb6e64661ac9ac014d5aa71c85c (patch)
treef09aeccbfae0c9155a9126e6278349800255fe90 /helsinki
parent48f14f2ee127a3a6aa3368a8284bc87a84fa51be (diff)
make trailing slash optional
Diffstat (limited to 'helsinki')
-rw-r--r--helsinki/program/urls_program.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/helsinki/program/urls_program.py b/helsinki/program/urls_program.py
index e310b43..f68d376 100644
--- a/helsinki/program/urls_program.py
+++ b/helsinki/program/urls_program.py
@@ -6,18 +6,18 @@ from models import Host, Show, TimeSlot
from views import current_show, day_schedule, recommendations, show_list, today_schedule, week_schedule
urlpatterns = patterns('',
- ('^/today/$', today_schedule),
- ('^/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', day_schedule),
- ('^/(?P<year>\d{4})/(?P<week>\d{1,2})/$', week_schedule),
- ('^/current_box/$', current_show),
- ('^/hosts/$', object_list, dict(template_object_name='host', queryset=Host.objects.all())),
- url('^/hosts/(?P<object_id>\d+)/$', object_detail, dict(template_object_name='host', queryset=Host.objects.all()), name='host-detail'),
- ('^/tips/$', recommendations),
- ('^/tips_box/$', recommendations, dict(template_name='program/recommendations_box.html')),
- ('^/shows/$', show_list),
- url('^/shows/(?P<slug>[\w-]+)/$', object_detail, dict(template_object_name='show', queryset=Show.objects.all()), name='show-detail'),
- url('^/(?P<object_id>\d+)/$', object_detail, dict(template_object_name='timeslot', queryset=TimeSlot.objects.all()), name='timeslot-detail'),
+ ('^/today/?$', today_schedule),
+ ('^/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/?$', day_schedule),
+ ('^/(?P<year>\d{4})/(?P<week>\d{1,2})/?$', week_schedule),
+ ('^/current_box/?$', current_show),
+ ('^/hosts/?$', object_list, dict(template_object_name='host', queryset=Host.objects.all())),
+ url('^/hosts/(?P<object_id>\d+)/?$', object_detail, dict(template_object_name='host', queryset=Host.objects.all()), name='host-detail'),
+ ('^/tips/?$', recommendations),
+ ('^/tips_box/?$', recommendations, dict(template_name='program/recommendations_box.html')),
+ ('^/shows/?$', show_list),
+ url('^/shows/(?P<slug>[\w-]+)/?$', object_detail, dict(template_object_name='show', queryset=Show.objects.all()), name='show-detail'),
+ url('^/(?P<object_id>\d+)/?$', object_detail, dict(template_object_name='timeslot', queryset=TimeSlot.objects.all()), name='timeslot-detail'),
# TODO: implement
- ('^/week/$', today_schedule),
- ('^/topics/$', recommendations),
+ ('^/week/?$', today_schedule),
+ ('^/topics/?$', recommendations),
)