Skip to content

F
flask-admin
Commit 2db878a4 authored by P.J. Janse van Rensburg's avatar P.J. Janse van Rensburg
Browse files
Options

Merge branch 'DaniilAnichin-feature/recursive-filter' into minor-fixes

parents 310fe4ab 461723b2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
flask_admin/contrib/sqla/view.py
View file @ 2db878a4
...@@ -716,6 +716,9 @@ class ModelView(BaseModelView): ...@@ -716,6 +716,9 @@ class ModelView(BaseModelView):
# target column to replace previous) # target column to replace previous)
if joined_column_name: if joined_column_name:
key_name = "{0}.{1}".format(joined_column_name, column) key_name = "{0}.{1}".format(joined_column_name, column)
if self._filter_joins.get(key_name):
key_name = '{0}.alias'.format(key_name)
for f in flt: for f in flt:
f.key_name = key_name f.key_name = key_name
......
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