Multi column support for column_default_sort

flask_admin/contrib/mongoengine/view.py

@@ -520,7 +520,9 @@ class ModelView(BaseModelView):
             order = self._get_default_order()
 
             if order:
-                query = query.order_by('%s%s' % ('-' if order[1] else '', order[0]))
+                keys = ['%s%s' % ('-' if desc else '', col)
+                        for (desc, col) in order]
+                query = query.order_by(*keys)
 
         # Pagination
         if page_size is None:

flask_admin/contrib/peewee/view.py

@@ -316,17 +316,24 @@ class ModelView(BaseModelView):
 
         return query
 
-    def _order_by(self, query, joins, sort_field, sort_desc):
+    def _order_by(self, query, joins, order):
+        clauses = []
+        for sort_field, sort_desc in order:
+            query, joins, clause = self._sort_clause(
+                query, joins, sort_field, sort_desc)
+            clauses.append(clause)
+        query = query.order_by(*clauses)
+        return query, joins
+
+    def _sort_clause(self, query, joins, sort_field, sort_desc):
         if isinstance(sort_field, string_types):
             field = getattr(self.model, sort_field)
-            query = query.order_by(field.desc() if sort_desc else field.asc())
+            clause = field.desc() if sort_desc else field.asc()
         elif isinstance(sort_field, Field):
             if sort_field.model_class != self.model:
                 query = self._handle_join(query, sort_field, joins)
-
-            query = query.order_by(sort_field.desc() if sort_desc else sort_field.asc())
-
-        return query, joins
+            clause = sort_field.desc() if sort_desc else sort_field.asc()
+        return query, joins, clause
 
     def get_query(self):
         return self.model.select()
@@ -395,13 +402,12 @@ class ModelView(BaseModelView):
         # Apply sorting
         if sort_column is not None:
             sort_field = self._sortable_columns[sort_column]
-
-            query, joins = self._order_by(query, joins, sort_field, sort_desc)
+            order = [(sort_field, sort_desc)]
+            query, joins = self._order_by(query, joins, order)
         else:
             order = self._get_default_order()
-
             if order:
-                query, joins = self._order_by(query, joins, order[0], order[1])
+                query, joins = self._order_by(query, joins, order)
 
         # Pagination
         if page_size is None:

flask_admin/contrib/pymongo/view.py

@@ -262,7 +262,8 @@ class ModelView(BaseModelView):
             order = self._get_default_order()
 
             if order:
-                sort_by = [(order[0], pymongo.DESCENDING if order[1] else pymongo.ASCENDING)]
+                sort_by = [(col, pymongo.DESCENDING if desc else pymongo.ASCENDING)
+                           for (col, desc) in order]
 
         # Pagination
         if page_size is None:

flask_admin/contrib/sqla/view.py

@@ -842,15 +842,9 @@ class ModelView(BaseModelView):
 
     def _get_default_order(self):
         order = super(ModelView, self)._get_default_order()
-
-        if order is not None:
-            field, direction = order
-
+        for field, direction in (order or []):
             attr, joins = tools.get_field_with_path(self.model, field)
-
-            return attr, joins, direction
-
-        return None
+            yield attr, joins, direction
 
     def _apply_sorting(self, query, joins, sort_column, sort_desc):
         if sort_column is not None:
@@ -861,10 +855,7 @@ class ModelView(BaseModelView):
                 query, joins = self._order_by(query, joins, sort_joins, sort_field, sort_desc)
         else:
             order = self._get_default_order()
-
-            if order:
-                sort_field, sort_joins, sort_desc = order
-
+            for sort_field, sort_joins, sort_desc in order:
                 query, joins = self._order_by(query, joins, sort_joins, sort_field, sort_desc)
 
         return query, joins

flask_admin/model/base.py

@@ -381,6 +381,12 @@ class BaseModelView(BaseView, ActionsMixin):
 
             class MyModelView(BaseModelView):
                 column_default_sort = ('user', True)
+
+        If you want to sort by more than one column,
+        you can pass a list of tuples::
+
+            class MyModelView(BaseModelView):
+                column_default_sort = [('name', True), ('last_name', True)]
     """
 
     column_searchable_list = ObsoleteAttr('column_searchable_list',
@@ -1435,10 +1441,12 @@ class BaseModelView(BaseView, ActionsMixin):
             Return default sort order
         """
         if self.column_default_sort:
-            if isinstance(self.column_default_sort, tuple):
+            if isinstance(self.column_default_sort, list):
                 return self.column_default_sort
+            if isinstance(self.column_default_sort, tuple):
+                return [self.column_default_sort]
             else:
-                return self.column_default_sort, False
+                return [(self.column_default_sort, False)]
 
         return None