Merge lp:~mhall119/loco-team-portal/globaljam-urls-change into lp:loco-team-portal

[Michael Hall]

Move dashboard page to /events/globaljam/dashboard/, make /events/globaljam/ an alias to the latest global jam event details page.

Jono has requested this change to the global jam URLs

[Adnane Belmadiaf (daker)]

Approve! it would be good if we can create bug report for features/requests like this so we can track what we are doing.

review: Approve

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2012-02-09 02:06:11 +0000
+++ loco_directory/events/urls.py	2012-02-15 15:59:25 +0000
@@ -6,7 +6,8 @@
     url(r'^history/$', 'events.views.event_history_list', name='event-history-list'),
 
     #special events
-    url(r'^globaljam/', 'events.views.global_jam', name='global-jam'),
+    url(r'^globaljam/$', 'events.views.global_jam', name='global-jam-dashboard'),
+    url(r'^globaljam/dashboard/$', 'events.views.global_jam_dashboard', name='global-jam'),
     
     #global events
     url(r'^global/ical/$', 'events.views.global_event_list_ical', name='global-event-list-ical'),

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2012-02-13 22:46:37 +0000
+++ loco_directory/events/views.py	2012-02-15 15:59:25 +0000
@@ -519,12 +519,18 @@
 
     return HttpResponse(json)
     
-
 def global_jam(request):
     try:
         global_event_object = GlobalEvent.objects.filter(name='Ubuntu Global Jam').order_by('-date_begin')[0]
     except IndexError:
         raise Http404
+    return global_event_detail(request, global_event_object.id)
+
+def global_jam_dashboard(request):
+    try:
+        global_event_object = GlobalEvent.objects.filter(name='Ubuntu Global Jam').order_by('-date_begin')[0]
+    except IndexError:
+        raise Http404
 
     context = {
         'global_event_object': global_event_object,