Merge pull request #760 from longhotsummer/patch-1

Fix SQLAlchemy default sort order when column name is ambiguous.

Merge pull request #760 from longhotsummer/patch-1
Fix SQLAlchemy default sort order when column name is ambiguous.
eb43f494 · Serge S. Koval · c8131d72 · 623f573b · eb43f494
Commit eb43f494 authored Jan 05, 2015 by Serge S. Koval
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

view.py flask_admin/contrib/sqla/view.py +1 -1

No files found.
--- a/flask_admin/contrib/sqla/view.py
+++ b/flask_admin/contrib/sqla/view.py
@@ -716,7 +716,7 @@ class ModelView(BaseModelView):

            join_tables, attr = self._get_field_with_path(field)

-            return join_tables, field, direction
+            return join_tables, attr, direction

        return None