# HG changeset patch
# User Lennard de Rijk <ljvderijk@gmail.com>
# Date 1247399721 -7200
# Node ID dc0d4c3d9d2e94bde3fd6235bc93ff5f273e2881
# Parent  d97bafb60f0ec04a82d2b6aff94851ca97fc9dce
Fixed passing along empty params to scope selection view.

diff -r d97bafb60f0e -r dc0d4c3d9d2e app/soc/views/models/base.py
--- a/app/soc/views/models/base.py	Sun Jul 12 12:50:01 2009 +0200
+++ b/app/soc/views/models/base.py	Sun Jul 12 13:55:21 2009 +0200
@@ -282,17 +282,15 @@
       kwargs: not used for create()
     """
 
-    new_params = dicts.merge(params, self._params)
+    params = dicts.merge(params, self._params)
 
     # redirect to scope selection view
-    if ('scope_view' in new_params) and ('scope_path' not in kwargs):
-      view = new_params['scope_view'].view
-      redirect = new_params['scope_redirect']
+    if ('scope_view' in params) and ('scope_path' not in kwargs):
+      view = params['scope_view'].view
+      redirect = params['scope_redirect']
       return self.select(request, view, redirect,
                          params=params, page_name=page_name, **kwargs)
 
-    params = new_params
-
     context = helper.responses.getUniversalContext(request)
     helper.responses.useJavaScript(context, params['js_uses_all'])
     context['page_name'] = page_name
@@ -662,14 +660,12 @@
       params: a dict with params for this View
       filter: a filter that all displayed entities should satisfy
     """
+    view_params = view.getParams().copy()
+    view_params['list_action'] = (redirect, params)
+    view_params['list_description'] = self.DEF_CREATE_INSTRUCTION_MSG_FMT % (
+        view_params['name'], self._params['name'])
 
-    params = dicts.merge(params, view.getParams())
-    params = dicts.merge(params, self._params)
-    params['list_action'] = (redirect, self._params)
-    params['list_description'] = self.DEF_CREATE_INSTRUCTION_MSG_FMT % (
-        params['name'], self._params['name'])
-
-    content = helper.lists.getListContent(request, params, filter=filter)
+    content = helper.lists.getListContent(request, view_params, filter=filter)
     contents = [content]
 
     return self._list(request, params, contents, page_name)