Merge lp:~daker/loco-team-portal/fix.656761 into lp:loco-team-portal

[Adnane Belmadiaf]

[Daniel Holbach (dholbach)]

This fixes parts of the problem:
 - http://127.0.0.1:8000/teams/ubuntu-ar/ works as expected
 - http://127.0.0.1:8000/teams/ubuntu-ar works as expected
 - http://127.0.0.1:8000/teams/ubuntu-ar/events works as expected
but
 - http://127.0.0.1:8000/teams/ubuntu-ar/events/ shows the team page

review: Needs Fixing

[lp:~daker/loco-team-portal/fix.656761]

310. By Adnane Belmadiaf on 2010-10-13

Another Fix to team urls

[Daniel Holbach (dholbach)]

http://127.0.0.1:8000/teams/ubuntu-ar/events still brings me to the team page.

review: Needs Fixing

[lp:~daker/loco-team-portal/fix.656761]

311. By Adnane Belmadiaf on 2010-10-18

Another fix to teams app url

[Daniel Holbach (dholbach)]

Good work!

review: Approve

=== modified file 'loco_directory/teams/urls.py'
--- loco_directory/teams/urls.py	2010-09-30 16:14:48 +0000
+++ loco_directory/teams/urls.py	2010-10-18 13:57:47 +0000
@@ -3,9 +3,9 @@
 urlpatterns = patterns('',
     url(r'^$', 'teams.views.team_list', name='team-list'),
     url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/edit$', 'teams.views.team_edit', name='team-edit'),
-    url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/merge$', 'teams.views.select_other_team', name='select-other-team'),
-    url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/merge/(?P<other_team_slug>[a-zA-Z0-9\-\.\+?]+)$', 'teams.views.team_merge', name='team-merge'),
-    url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/events/history$', 'teams.views.team_event_history', name='team-event-history'),
-    url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/events$', 'teams.views.team_event_list', name='team-event-list'),
-    url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)$', 'teams.views.team_detail', name='team-detail'),
+    url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/merge/(?P<other_team_slug>[a-zA-Z0-9\-\.\+?]+)/$', 'teams.views.team_merge', name='team-merge'),
+    url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/merge', 'teams.views.select_other_team', name='select-other-team'),
+    url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/events/history', 'teams.views.team_event_history', name='team-event-history'),
+    url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/events', 'teams.views.team_event_list', name='team-event-list'),
+    url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)', 'teams.views.team_detail', name='team-detail'),
 )