Commit 135b4d71 authored by Serge S. Koval's avatar Serge S. Koval

Merge pull request #999 from guillaumep/sqla-orderby

Implement order_by option in SQL Alchemy QueryAjaxModelLoader
parents 7399e567 f730d811
...@@ -17,6 +17,7 @@ class QueryAjaxModelLoader(AjaxModelLoader): ...@@ -17,6 +17,7 @@ class QueryAjaxModelLoader(AjaxModelLoader):
self.session = session self.session = session
self.model = model self.model = model
self.fields = options.get('fields') self.fields = options.get('fields')
self.order_by = options.get('order_by')
if not self.fields: if not self.fields:
raise ValueError('AJAX loading requires `fields` to be specified for %s.%s' % (model, self.name)) raise ValueError('AJAX loading requires `fields` to be specified for %s.%s' % (model, self.name))
...@@ -61,6 +62,9 @@ class QueryAjaxModelLoader(AjaxModelLoader): ...@@ -61,6 +62,9 @@ class QueryAjaxModelLoader(AjaxModelLoader):
filters = (field.ilike(u'%%%s%%' % term) for field in self._cached_fields) filters = (field.ilike(u'%%%s%%' % term) for field in self._cached_fields)
query = query.filter(or_(*filters)) query = query.filter(or_(*filters))
if self.order_by:
query = query.order_by(self.order_by)
return query.offset(offset).limit(limit).all() return query.offset(offset).limit(limit).all()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment