Merge lp:~cjohnston/summit/today into lp:summit

[Chris Johnston]

Changes /today url to /summit_name/today

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2011-05-15 02:19:17 +0000
+++ summit/schedule/views.py	2011-07-18 00:53:22 +0000
@@ -101,6 +101,14 @@
 
 @summit_required
 def by_date(request, summit, attendee, date):
+    return _process_date_view(request, summit, attendee, date)
+
+@summit_required
+def today_view(request, summit, attendee):
+    today = summit.localize(datetime.datetime.now()).date()
+    return _process_date_view(request, summit, attendee, today.strftime("%Y-%m-%d"))
+
+def _process_date_view(request, summit, attendee, date):
     schedule = schedule_factory(request, summit, attendee, date=date)
 
     if request.method == 'POST':
@@ -127,11 +135,6 @@
     return render_to_response("schedule/schedule.html", context,
                               context_instance=RequestContext(request))
 
-def today_view(request):
-    summit = Summit.objects.next()
-    today = summit.localize(datetime.datetime.now()).date()
-    return by_date(request, summit.name, today.strftime("%Y-%m-%d"))
-
 @summit_required
 def next_session(request, summit, attendee):
     schedule = Schedule(request, summit, attendee)

=== modified file 'summit/urls.py'
--- summit/urls.py	2011-05-22 18:08:35 +0000
+++ summit/urls.py	2011-07-18 00:53:22 +0000
@@ -52,7 +52,7 @@
 )
 
 urlpatterns += patterns('summit.schedule.views',
-    (r'^today/$', 'today_view'),
+    (r'^(?P<summit_name>[\w-]+)/today/$', 'today_view'),
     url(r'^past/', 'past', name='past'),
     url(r'^mobile/', 'mobile', name='mobile'),
     url(r'^logout$', 'logout_view', name='logout'),