From dfbf111e3c76eece6e9513ac0d4ba0f9e843407b Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 25 Jun 2012 21:40:16 -0500 Subject: [PATCH] distinct in autocomplete, thanks Brent Zeiben --- VERSION | 2 +- gluon/sqlhtml.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 8c27771a..a300ea74 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-06-25 16:48:59) dev +Version 2.00.0 (2012-06-25 21:40:13) dev diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 2173474c..d20a19d2 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -536,7 +536,7 @@ class AutocompleteWidget(object): _class = 'string' def __init__(self, request, field, id_field=None, db=None, - orderby=None, limitby=(0,10), + orderby=None, limitby=(0,10), distinct=False, keyword='_autocomplete_%(fieldname)s', min_length=2, help_fields=None, help_string=None): @@ -550,6 +550,7 @@ class AutocompleteWidget(object): self.db = db or field._db self.orderby = orderby self.limitby = limitby + self.distinct = distinct self.min_length = min_length self.fields=[field] if id_field: @@ -568,7 +569,8 @@ class AutocompleteWidget(object): if self.keyword in self.request.vars: field = self.fields[0] rows = self.db(field.like(self.request.vars[self.keyword]+'%'))\ - .select(orderby=self.orderby,limitby=self.limitby,*self.fields) + .select(orderby=self.orderby,limitby=self.limitby, + distinct=self.distinct,*self.fields) if rows: if self.is_reference: id_field = self.fields[1]