From 27287d246a15a5c490d6afb7e23bcbde5e0e6a0d Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 3 Jun 2013 22:17:11 -0500 Subject: [PATCH] fixed Issue 1512:AutocompleteWidget, help_fields parameter, thanks Mirek --- VERSION | 2 +- gluon/sqlhtml.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 088ab459..5bc3505c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.7-stable+timestamp.2013.06.03.22.11.22 +Version 2.4.7-stable+timestamp.2013.06.03.22.16.28 diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index c1188636..1d52201d 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -650,7 +650,8 @@ class AutocompleteWidget(object): self.help_fields = help_fields or [] self.help_string = help_string if self.help_fields and not self.help_string: - self.help_string = ' '.join('%%(%s)s' for f in self.help_fields) + self.help_string = ' '.join('%%(%s)s'%f.name + for f in self.help_fields) self.request = request self.keyword = keyword % dict(tablename=field.tablename, @@ -676,9 +677,9 @@ class AutocompleteWidget(object): if self.keyword in self.request.vars: field = self.fields[0] if is_gae: - rows = self.db(field.__ge__(self.request.vars[self.keyword]) & field.__lt__(self.request.vars[self.keyword] + u'\ufffd')).select(orderby=self.orderby, limitby=self.limitby, *self.fields) + rows = self.db(field.__ge__(self.request.vars[self.keyword]) & field.__lt__(self.request.vars[self.keyword] + u'\ufffd')).select(orderby=self.orderby, limitby=self.limitby, *(self.fields+self.help_field)) else: - rows = self.db(field.like(self.request.vars[self.keyword] + '%')).select(orderby=self.orderby, limitby=self.limitby, distinct=self.distinct, *self.fields) + rows = self.db(field.like(self.request.vars[self.keyword] + '%')).select(orderby=self.orderby, limitby=self.limitby, distinct=self.distinct, *(self.fields+self.help_field)) if rows: if self.is_reference: id_field = self.fields[1]