Skip to content

F
flask-admin
Commit 0cd24273 authored by Serge S. Koval's avatar Serge S. Koval Committed by GitHub
Browse files
Options

Merge pull request #1296 from stepsame/feature_multiple_sort 

support multiple column sort with column_sortable_list
parents e0b3aa59 a255170b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
flask_admin/contrib/sqla/view.py
View file @ 0cd24273
...@@ -788,9 +788,15 @@ class ModelView(BaseModelView): ...@@ -788,9 +788,15 @@ class ModelView(BaseModelView):
column = sort_field if alias is None else getattr(alias, sort_field.key) column = sort_field if alias is None else getattr(alias, sort_field.key)
if sort_desc: if sort_desc:
query = query.order_by(desc(column)) if isinstance(column, tuple):
query = query.order_by(*map(desc, column))
else:
query = query.order_by(desc(column))
else: else:
query = query.order_by(column) if isinstance(column, tuple):
query = query.order_by(*column)
else:
query = query.order_by(column)
return query, joins return query, joins
......
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