# HG changeset patch # User Sylvain Thénault # Date 1286212149 -7200 # Node ID 7372100062e8c6f550dfbb23988916a88a0ae4a2 # Parent faee4c380e50d58fbb6430dd5edd50ab6f37856b include fcayre's patch #1060507 to get extra rql query parameters from form content in rgx_action diff -r faee4c380e50 -r 7372100062e8 web/views/urlrewrite.py --- a/web/views/urlrewrite.py Mon Oct 04 19:05:51 2010 +0200 +++ b/web/views/urlrewrite.py Mon Oct 04 19:09:09 2010 +0200 @@ -163,7 +163,7 @@ return do_build_rset def rgx_action(rql=None, args=None, cachekey=None, argsgroups=(), setuser=False, - form=None, formgroups=(), transforms={}, controller=None): + form=None, formgroups=(), transforms={}, rqlformparams=(), controller=None): def do_build_rset(inputurl, uri, req, schema, cachekey=cachekey # necessary to avoid UnboundLocalError ): @@ -183,6 +183,8 @@ kwargs[key] = typed_eid(value) if setuser: kwargs['u'] = req.user.eid + for param in rqlformparams: + kwargs.setdefault(param, req.form.get(param)) rset = req.execute(rql, kwargs, cachekey) else: rset = None