# HG changeset patch
# User Lennard de Rijk <ljvderijk@gmail.com>
# Date 1256521403 25200
# Node ID 5f135cfac19425e5f8d14fb37f9ee4bb7d6aae3b
# Parent  45b5738619d31e0ce91b8063fd073a3424f805c8
Reworked the redirects to work with the new Request model.

Also made use of the collection of Role Views in the Role View in combination with the role property in the Request model, to facilitate the redirects.

diff -r 45b5738619d3 -r 5f135cfac194 app/soc/views/helper/redirects.py
--- a/app/soc/views/helper/redirects.py	Sun Oct 25 18:41:56 2009 -0700
+++ b/app/soc/views/helper/redirects.py	Sun Oct 25 18:43:23 2009 -0700
@@ -264,8 +264,12 @@
   """Returns the redirect for processing the specified request entity.
   """
 
-  result = '/%s/process_request/%s/%s' % (
-      entity.role, entity.scope_path, entity.link_id)
+  from soc.views.models.role import ROLE_VIEWS
+
+  role_view = ROLE_VIEWS[entity.role]
+
+  result = '/%s/process_request/%s' % (
+      role_view.getParams()['url_name'], entity.key().id_or_name())
 
   return result
 
@@ -303,17 +307,21 @@
 def getInviteAcceptedRedirect(entity, _):
   """Returns the redirect for accepting an invite.
   """
-  # TODO: redesign this redirect to use ROLE_VIEWS from the Role View
-  return '/%s/accept_invite/%s/%s' % (
-      entity.role, entity.scope_path, entity.link_id)
+
+  from soc.views.models.role import ROLE_VIEWS
+
+  role_params = ROLE_VIEWS[entity.role].getParams()
+
+  return '/%s/accept_invite/%s' % (
+      role_params['url_name'], entity.key().id_or_name())
 
 
 def getInviteProcessRedirect(entity, _):
   """Returns the redirect for processing an invite.
   """
 
-  return '/request/process_invite/%s/%s/%s' % (
-      entity.scope_path, entity.role, entity.link_id)
+  return '/request/process_invite/%s' % (
+      entity.key().id_or_name())
 
 
 def getApplicantRedirect(entity, params):