Merge branch 'MihaiBalint-master' into minor-fixes

flask_admin/contrib/sqla/ajax.py

@@ -58,13 +58,16 @@ class QueryAjaxModelLoader(AjaxModelLoader):
 
         return getattr(model, self.pk), as_unicode(model)
 
+    def get_query(self):
+        return self.session.query(self.model)
+
     def get_one(self, pk):
         # prevent autoflush from occuring during populate_obj
         with self.session.no_autoflush:
-            return self.session.query(self.model).get(pk)
+            return self.get_query().get(pk)
 
     def get_list(self, term, offset=0, limit=DEFAULT_PAGE_SIZE):
-        query = self.session.query(self.model)
+        query = self.get_query()
 
         filters = (cast(field, String).ilike(u'%%%s%%' % term) for field in self._cached_fields)
         query = query.filter(or_(*filters))