# HG changeset patch
# User Sverre Rabbelier <srabbelier@gmail.com>
# Date 1228255478 0
# Node ID 5105939d3bb43b4136f5dced478ca1fb10702ed7
# Parent  02323664d53221581c2aa4ed1e2f93a7b9b5e20a
Make the 'select entity' View generic

This allows the selection of any entity from an arbitrary View
by specifying the 'target view' and the redirect function.

Patch by: Sverre Rabbelier

diff -r 02323664d532 -r 5105939d3bb4 app/soc/views/models/base.py
--- a/app/soc/views/models/base.py	Tue Dec 02 22:04:15 2008 +0000
+++ b/app/soc/views/models/base.py	Tue Dec 02 22:04:38 2008 +0000
@@ -458,6 +458,33 @@
 
     return http.HttpResponseRedirect(redirect)
 
+  def select(self, request, view, redirect, page_name=None, params=None):
+    """Displays a list page allowing the user to select an entity
+
+    After having selected the Sponsor, the user is redirected to the
+    'create a new program' page with the scope_path set appropriately.
+
+    Params usage:
+      The params dictionary is also passed to getListContent from
+        the helper.list module, please refer to its docstring also.
+      The params dictionary is passed to self._list as well, refer
+        to its docstring for details on how it uses it.
+
+    Args:
+      request: the standard Django HTTP request object
+      page_name: the page name displayed in templates as page and header title
+      params: a dict with params for this View
+    """
+
+    params = dicts.merge(params, view.getParams())
+    params = dicts.merge(params, self._params)
+    params['list_action'] = (redirect, self._params)
+
+    content = helper.lists.getListContent(request, params)
+    contents = [content]
+
+    return self._list(request, params, contents, page_name)
+
   def _editPost(self, request, entity, fields):
     """Performs any required processing on the entity to post its edit page.
 
diff -r 02323664d532 -r 5105939d3bb4 app/soc/views/models/program.py
--- a/app/soc/views/models/program.py	Tue Dec 02 22:04:15 2008 +0000
+++ b/app/soc/views/models/program.py	Tue Dec 02 22:04:38 2008 +0000
@@ -72,12 +72,12 @@
 
     base.View.__init__(self, params=params)
 
-  def create(self, request, page_name=None, params=None, **kwargs):
+  def create(self, request, **kwargs):
     """Specialized create view to enforce needing a scope_path
 
     This view simply gives control to the base.View.create if the
     scope_path is specified in kwargs. If it is not present, it
-    instead displays the result of self.selectSponsor. Refer to the
+    instead displays the result of self.select. Refer to the
     respective docstrings on what they do.
 
     Args: 
@@ -85,47 +85,11 @@
     """
 
     if 'scope_path' in kwargs:
-      return super(View, self).create(request, page_name=page_name,
-          params=params, **kwargs)
-
-    return self.selectSponsor(request, page_name, params)
-
-  def selectSponsor(self, request, page_name, params):
-    """Displays a list page allowing the user to select a Sponsor
-
-    After having selected the Sponsor, the user is redirected to the
-    'create a new program' page with the scope_path set appropriately.
-
-    Params usage:
-      The params dictionary is passed to getCreateProgramRedirect from
-        the redirects module, please see the docstring for
-        getCreateProgramRedirect on how it uses it.
-      The params dictionary is also passed to getListContent from
-        the helper.list module, please refer to its docstring also.
-      The params dictionary is passed to self._list as well, refer
-        to its docstring for details on how it uses it.
-
-    Args:
-      request: the standard Django HTTP request object
-      page_name: the page name displayed in templates as page and header title
-      params: a dict with params for this View
-    """
+      return super(View, self).create(request, **kwargs)
 
     view = sponsor_view.view
     redirect = redirects.getCreateRedirect
-
-    params = dicts.merge(params, self._params)
-
-    new_params = {}
-    new_params['list_action'] = (redirect, params)
-
-    new_params = dicts.merge(new_params, view.getParams())
-    params = dicts.merge(new_params, params)
-
-    content = helper.lists.getListContent(request, params)
-    contents = [content]
-
-    return self._list(request, params, contents, page_name)
+    return self.select(request, view, redirect, **kwargs)
 
   def _editGet(self, request, entity, form):
     """See base.View._editGet().