damned-lies r1220 - in trunk: . people

[claudep svn gnome org]

Author: claudep
Date: Mon Dec 15 09:50:56 2008
New Revision: 1220
URL: http://svn.gnome.org/viewvc/damned-lies?rev=1220&view=rev

Log:
2008-12-15  Claude Paroz  <claude 2xlibre net>

	* people/models.py: Use username (slug) instead of id for get_absolute_url.
	* people/urls.py: Rename one of the two 'person' url pattern so as to be
	unique.

Modified:
   trunk/ChangeLog
   trunk/people/models.py
   trunk/people/urls.py

Modified: trunk/people/models.py
==============================================================================
--- trunk/people/models.py	(original)
+++ trunk/people/models.py	Mon Dec 15 09:50:56 2008
@@ -55,7 +55,7 @@
 
     @models.permalink
     def get_absolute_url(self):
-        return ('person', [str(self.id)])
+        return ('person', [self.username])
 
     def is_committer(self, team):
         try:

Modified: trunk/people/urls.py
==============================================================================
--- trunk/people/urls.py	(original)
+++ trunk/people/urls.py	Mon Dec 15 09:50:56 2008
@@ -11,8 +11,7 @@
     
 urlpatterns = patterns('',
     url(r'^$', 'django.views.generic.list_detail.object_list', dict(info_dict_list), 'persons'),                    
-    url(r'^(?P<object_id>\d+)/$', 'people.views.person_detail_from_id', name='person'),
+    url(r'^(?P<object_id>\d+)/$', 'people.views.person_detail_from_id', name='person_from_id'),
     # equivalent to the previous, but using username instead of user pk
-    # FIXME The name isn't unique ('person')!
     url(r'^(?P<slug>\w+)/$', 'people.views.person_detail_from_username', name='person')
 )