Add tests for multiple columns

flask_admin/tests/mongoengine/test_basic.py

@@ -685,9 +685,9 @@ def test_default_sort():
     app, db, admin = setup()
     M1, _ = create_models(db)
 
-    M1(test1='c').save()
-    M1(test1='b').save()
-    M1(test1='a').save()
+    M1(test1='c', test2='x').save()
+    M1(test1='b', test2='x').save()
+    M1(test1='a', test2='y').save()
 
     eq_(M1.objects.count(), 3)
 
@@ -700,6 +700,18 @@ def test_default_sort():
     eq_(data[1].test1, 'b')
     eq_(data[2].test1, 'c')
 
+    # test default sort with multiple columns
+    order = [('test2', False), ('test1', False)]
+    view2 = CustomModelView(M1, column_default_sort=order, endpoint='m1_2')
+    admin.add_view(view2)
+
+    _, data = view2.get_list(0, None, None, None, None)
+
+    eq_(len(data), 3)
+    eq_(data[0].test1, 'b')
+    eq_(data[1].test1, 'c')
+    eq_(data[2].test1, 'a')
+
 
 def test_extra_fields():
     app, db, admin = setup()

flask_admin/tests/peeweemodel/test_basic.py

@@ -870,8 +870,8 @@ def test_default_sort():
     M1, _ = create_models(db)
 
     M1('c', 1).save()
-    M1('b', 2).save()
-    M1('a', 3).save()
+    M1('b', 1).save()
+    M1('a', 2).save()
 
     eq_(M1.select().count(), 3)
 
@@ -884,6 +884,18 @@ def test_default_sort():
     eq_(data[1].test1, 'b')
     eq_(data[2].test1, 'c')
 
+    # test default sort with multiple columns
+    order = [('test2', False), ('test1', False)]
+    view2 = CustomModelView(M1, column_default_sort=order, endpoint='m1_2')
+    admin.add_view(view2)
+
+    _, data = view2.get_list(0, None, None, None, None)
+
+    eq_(len(data), 3)
+    eq_(data[0].test1, 'b')
+    eq_(data[1].test1, 'c')
+    eq_(data[2].test1, 'a')
+
 
 def test_extra_fields():
     app, db, admin = setup()

flask_admin/tests/sqla/test_basic.py

@@ -1676,7 +1676,7 @@ def test_default_sort():
     app, db, admin = setup()
     M1, _ = create_models(db)
 
-    db.session.add_all([M1('c'), M1('b'), M1('a')])
+    db.session.add_all([M1('c', 'x'), M1('b', 'x'), M1('a', 'y')])
     db.session.commit()
     eq_(M1.query.count(), 3)
 
@@ -1715,6 +1715,18 @@ def test_default_sort():
     eq_(data[1].test1, 'b')
     eq_(data[2].test1, 'c')
 
+    # test default sort with multiple columns
+    order = [('test2', False), ('test1', False)]
+    view4 = CustomModelView(M1, db.session, column_default_sort=order, endpoint='m1_4')
+    admin.add_view(view4)
+
+    _, data = view4.get_list(0, None, None, None, None)
+
+    eq_(len(data), 3)
+    eq_(data[0].test1, 'b')
+    eq_(data[1].test1, 'c')
+    eq_(data[2].test1, 'a')
+
 
 def test_complex_sort():
     app, db, admin = setup()