[#2579] some refactoring

ckan · Jun 21, 2012 · 858835c · 858835c
1 parent 20eb92d
commit 858835c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/ckan/controllers/group.py b/ckan/controllers/group.py
@@ -148,9 +148,9 @@ def search_url(params):
 
         def drill_down_url(**by):
             return h.add_url_param(alternative_url=None,
-                                    controller='group', action='read',
-                                    extras=dict(id=c.group_dict.get('name')),
-                                    **by)
+                                   controller='group', action='read',
+                                   extras=dict(id=c.group_dict.get('name')),
+                                   new_params=by)
 
         c.drill_down_url = drill_down_url
 

diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
@@ -120,7 +120,8 @@ def search(self):
 
         def drill_down_url(alternative_url=None, **by):
             return h.add_url_param(alternative_url=alternative_url,
-                                    controller='package', action='search', **by)
+                                   controller='package', action='search',
+                                   new_params=by)
 
         c.drill_down_url = drill_down_url
 

diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -891,7 +891,7 @@ def url_with_params(url, params):
     return url_with_params(url, params)
 
 def add_url_param(alternative_url=None, controller=None, action=None,
-                   extras=None, **fields):
+                   extras=None, new_params=None):
     '''
     Adds extra parameters to existing ones
 
@@ -901,14 +901,15 @@ def add_url_param(alternative_url=None, controller=None, action=None,
     '''
     params_nopage = [(k, v) for k,v in request.params.items() if k != 'page']
     params = set(params_nopage)
-    params |= set(fields.items())
+    if new_params:
+        params |= set(new_params.items())
     if alternative_url:
         return url_with_params(alternative_url, params)
     return _create_url_with_params(params=params, controller=controller,
                                    action=action, extras=extras)
 
-def remove_url_param(key, value=None, replace=None, controller=None, action=None,
-                 extras=None):
+def remove_url_param(key, value=None, replace=None, controller=None,
+                     action=None, extras=None):
     ''' Remove a key from the current parameters. A specific key/value
     pair can be removed by passing a second value argument otherwise all
     pairs matching the key will be removed. If replace is given then a