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

2db878a4 · P.J. Janse van Rensburg · 310fe4ab · 461723b2 · 2db878a4
Commit 2db878a4 authored Jul 01, 2019 by P.J. Janse van Rensburg
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

view.py flask_admin/contrib/sqla/view.py +3 -0

No files found.
--- a/flask_admin/contrib/sqla/view.py
+++ b/flask_admin/contrib/sqla/view.py
@@ -716,6 +716,9 @@ class ModelView(BaseModelView):
            # target column to replace previous)
            if joined_column_name:
                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:
                    f.key_name = key_name