--- a/app/soc/views/helper/redirects.py	Sat Apr 11 22:57:23 2009 +0000
+++ b/app/soc/views/helper/redirects.py	Sat Apr 11 22:58:19 2009 +0000
@@ -31,7 +31,7 @@
   """
 
   result ='/%s/apply/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -40,7 +40,7 @@
   """
 
   result ='/%s/invite/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -50,7 +50,7 @@
   """
 
   result ='/%s/create/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -60,7 +60,7 @@
   """
 
   return '/%s/edit/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 
 def getPublicRedirect(entity, params):
@@ -68,7 +68,7 @@
   """
 
   return '/%s/show/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 
 def getAdminRedirect(entity, params):
@@ -76,7 +76,7 @@
   """
 
   return '/%s/admin/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 
 def getListRedirect(entity, params):
@@ -84,7 +84,7 @@
   """
 
   return '/%s/list/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 
 def getPublicListRedirect(entity, params):
@@ -92,7 +92,7 @@
   """
 
   return '/%s/list_public/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 
 def getExportRedirect(entity, params):
@@ -100,7 +100,7 @@
   """
 
   return '/%s/export/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 
 def getHomeRedirect(entity, params):
@@ -108,14 +108,14 @@
   """
 
   return '/%s/home/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 def getReviewRedirect(entity, params):
   """Returns the redirect to review the specified entity.
   """
   
   return '/%s/review/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 def getReviewOverviewRedirect(entity, params):
   """Returns the redirect to the review_overview using the 
@@ -123,14 +123,14 @@
   """
 
   return '/%s/review_overview/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 def getCreateRequestRedirect(entity, params):
   """Returns the create request redirect for the specified entity.
   """
 
   result ='/request/create/%s/%s/%s' % (
-      params['group_scope'], params['url_name'], entity.key().name())
+      params['group_scope'], params['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -140,7 +140,7 @@
   """
 
   result ='/%s/request/%s' % (
-      role_name, entity.key().name())
+      role_name, entity.key().id_or_name())
 
   return result
 
@@ -150,7 +150,7 @@
   """
 
   result ='/%s/invite/%s' % (
-      role_name, entity.key().name())
+      role_name, entity.key().id_or_name())
 
   return result
 
@@ -161,7 +161,7 @@
   """
 
   result = '/%s/list_proposals/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -171,7 +171,7 @@
   """
 
   result = '/%s/accepted_orgs/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -192,7 +192,7 @@
   """
 
   result = '/%s/list_requests/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -202,7 +202,7 @@
   """
 
   result = '/%s/list_self/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -213,7 +213,7 @@
   """
 
   result = '/%s/list_roles/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -240,7 +240,7 @@
   """
 
   result = '/%s/manage/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -250,7 +250,7 @@
   """
 
   result = '/%s/manage_overview/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -286,7 +286,7 @@
   """
 
   return '/%s/applicant/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 
 def getStudentEditRedirect(entity, params):
@@ -320,7 +320,7 @@
   """
 
   return'/%s/slots/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 
 def getAssignSlotsRedirect(entity, params):
@@ -328,21 +328,21 @@
   """
 
   return'/%s/assign_slots/%s' % (
-      params['url_name'], entity.key().name())
+      params['url_name'], entity.key().id_or_name())
 
 
 def getCreateDocumentRedirect(entity, prefix):
   """Returns the redirect for new documents.
   """
 
-  return '/document/create/%s/%s' % (prefix, entity.key().name())
+  return '/document/create/%s/%s' % (prefix, entity.key().id_or_name())
 
 
 def getListDocumentsRedirect(entity, prefix):
   """Returns the redirect for listing documents.
   """
 
-  return '/document/list/%s/%s' % (prefix, entity.key().name())
+  return '/document/list/%s/%s' % (prefix, entity.key().id_or_name())
 
 
 def getToSRedirect(presence):