Commit 895e9ae0 authored by PJ Janse van Rensburg's avatar PJ Janse van Rensburg

Merge branch 'master' of https://github.com/Flared/flask-admin into sqla-sorting

parents 99a62362 3672af35
......@@ -509,8 +509,6 @@ class ModelView(BaseModelView):
# column is in same table, use only model attribute name
if getattr(column, 'key', None) is not None:
column_name = column.key
else:
column_name = text_type(c)
# column_name must match column_name used in `get_list_columns`
result[column_name] = column
......
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