From 646ad05aaa1ce171c93b694b7cfa094449c534bb Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 29 Jun 2012 11:22:04 -0500 Subject: [PATCH] issue 523, search_widget can be a dict, thanks Ato --- VERSION | 2 +- gluon/sqlhtml.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 201276df..de5a1d47 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-06-29 09:34:03) dev +Version 2.00.0 (2012-06-29 11:21:59) dev diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index d20a19d2..f5ba2afb 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1717,6 +1717,8 @@ class SQLFORM(FORM): if searchable: sfields = reduce(lambda a,b:a+b, [[f for f in t if f.readable] for t in tables]) + if isinstance(search_widget,dict): + search_widget = search_widget[tablename] if search_widget=='default': mq,mf,ms = SQLFORM.search_menu(sfields) search_widget = lambda sfield, url: FORM(