Commit 110566c6 authored by Serge S. Koval's avatar Serge S. Koval

Merge branch 'master' of github.com:mrjoes/flask-admin

parents d2c67d08 f0d6f788
......@@ -483,7 +483,8 @@ class ModelView(BaseModelView):
if self._search_supported and search:
# Apply search-related joins
if self._search_joins:
query = query.join(*self._search_joins.values())
for j in self._search_joins.values():
query = query.join(j)
joins = set(self._search_joins.keys())
# Apply terms
......
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