Merge lp:~dholbach/loco-team-portal/0.1-fixfor474124 into lp:~ltp-devs/loco-team-portal/0.1

[Daniel Holbach]

[Efrain Valles (effie-jayx)]

the fix works quite well

review: Approve

=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py	2009-10-31 01:12:09 +0000
+++ loco_directory/teams/models.py	2009-11-04 18:10:23 +0000
@@ -43,11 +43,8 @@
         ordering = ('approved', 'name',)
         
     def __unicode__(self):
-        return self.name
+        return self.lp_name
     
     @models.permalink
     def get_absolute_url(self):
-        return ('team_slug', [self.name])
-    
-    def get_name(self):
-        return _(self.name)
+        return ('team_slug', [self.lp_name])

=== modified file 'loco_directory/teams/urls.py'
--- loco_directory/teams/urls.py	2009-06-24 09:29:09 +0000
+++ loco_directory/teams/urls.py	2009-11-04 18:10:23 +0000
@@ -6,14 +6,14 @@
 info_dict = {
     'queryset': Team.objects.all(),
     'template_object_name': 'team',
-    'slug_field': 'name',
+    'slug_field': 'lp_name',
     'extra_content': {'pageSection': 'teams'},
 }
 
 urlpatterns = patterns('',
     url(r'reapprovals', 'teams.views.reapprovals', name='reapprovals'),
     url(r'^$', 'teams.views.teams', name='teams'),
-    url(r'(?P<team_slug>[\w\ \-\_@]+)', 'teams.views.team', name='team_slug'),
+    url(r'(?P<team_slug>[\.\w\ \-\_@]+)$', 'teams.views.team', name='team_slug'),
     url(r'(?P<object_id>\d+)', 'django.views.generic.list_detail.object_detail',
         dict(info_dict), 'team'),
 )

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2009-11-02 19:50:07 +0000
+++ loco_directory/teams/views.py	2009-11-04 18:10:23 +0000
@@ -35,7 +35,7 @@
     
 def team(request, team_slug):
     try:
-        team = Team.objects.get(name=team_slug)
+        team = Team.objects.get(lp_name=team_slug)
     except:
         raise Team.DoesNotExist, "%s" % team_slug
     context = {