distinct in autocomplete, thanks Brent Zeiben
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.00.0 (2012-06-25 16:48:59) dev
|
Version 2.00.0 (2012-06-25 21:40:13) dev
|
||||||
|
|||||||
+4
-2
@@ -536,7 +536,7 @@ class AutocompleteWidget(object):
|
|||||||
_class = 'string'
|
_class = 'string'
|
||||||
|
|
||||||
def __init__(self, request, field, id_field=None, db=None,
|
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',
|
keyword='_autocomplete_%(fieldname)s',
|
||||||
min_length=2, help_fields=None, help_string=None):
|
min_length=2, help_fields=None, help_string=None):
|
||||||
|
|
||||||
@@ -550,6 +550,7 @@ class AutocompleteWidget(object):
|
|||||||
self.db = db or field._db
|
self.db = db or field._db
|
||||||
self.orderby = orderby
|
self.orderby = orderby
|
||||||
self.limitby = limitby
|
self.limitby = limitby
|
||||||
|
self.distinct = distinct
|
||||||
self.min_length = min_length
|
self.min_length = min_length
|
||||||
self.fields=[field]
|
self.fields=[field]
|
||||||
if id_field:
|
if id_field:
|
||||||
@@ -568,7 +569,8 @@ class AutocompleteWidget(object):
|
|||||||
if self.keyword in self.request.vars:
|
if self.keyword in self.request.vars:
|
||||||
field = self.fields[0]
|
field = self.fields[0]
|
||||||
rows = self.db(field.like(self.request.vars[self.keyword]+'%'))\
|
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 rows:
|
||||||
if self.is_reference:
|
if self.is_reference:
|
||||||
id_field = self.fields[1]
|
id_field = self.fields[1]
|
||||||
|
|||||||
Reference in New Issue
Block a user