Merge branch 'bugfix/bogus-sort-url-param' of...

Merge branch 'bugfix/bogus-sort-url-param' of https://github.com/SpotlightKid/flask-admin into handle-stale-sort-parameter

flask_admin/contrib/fileadmin/__init__.py

@@ -844,6 +844,11 @@ class BaseFileAdmin(BaseView, ActionsMixin):
             if self.default_desc:
                 sort_desc = self.default_desc
 
+        try:
+            column_index = self.possible_columns.index(sort_column)
+        except ValueError:
+            sort_column = self.default_sort_column
+
         if sort_column is None:
             # Sort by name
             items.sort(key=itemgetter(0))
@@ -853,7 +858,6 @@ class BaseFileAdmin(BaseView, ActionsMixin):
                 # Sort by modified date
                 items.sort(key=lambda x: (x[0], x[1], x[2], x[3], datetime.utcfromtimestamp(x[4])), reverse=True)
         else:
-            column_index = self.possible_columns.index(sort_column)
             items.sort(key=itemgetter(column_index), reverse=sort_desc)
 
         # Generate breadcrumbs

flask_admin/tests/fileadmin/test_fileadmin.py

+import os
 import os.path as op
 import unittest
 
-from nose.tools import eq_, ok_
+from nose.tools import eq_, ok_, with_setup
 
 from flask_admin.contrib import fileadmin
 from flask_admin import Admin
@@ -137,6 +138,32 @@ class Base:
             ok_('path=dummy_renamed_dir' not in rv.data.decode('utf-8'))
             ok_('path=dummy.txt' in rv.data.decode('utf-8'))
 
+        def add_file():
+            # make sure that 'files/dummy2.txt' exists, is newest and has bigger size
+            with open(op.join(op.dirname(__file__), 'files', 'dummy2.txt'), 'w') as fp:
+                fp.write('test')
+
+        def remove_file():
+            try:
+                os.remove(op.join(op.dirname(__file__), 'files', 'dummy2.txt'))
+            except (IOError, OSError):
+                pass
+
+        @with_setup(add_file, remove_file)
+        def test_fileadmin_sort_bogus_url_param():
+            app, admin, view = create_view()
+            client = app.test_client()
+
+            rv = client.get('/admin/myfileadmin/?sort=bogus')
+            eq_(rv.status_code, 200)
+            ok_(rv.data.decode('utf-8').find('path=dummy2.txt') <
+                rv.data.decode('utf-8').find('path=dummy.txt'))
+
+            rv = client.get('/admin/myfileadmin/?sort=name')
+            eq_(rv.status_code, 200)
+            ok_(rv.data.decode('utf-8').find('path=dummy.txt') <
+                rv.data.decode('utf-8').find('path=dummy2.txt'))
+
         def test_modal_edit(self):
             # bootstrap 2 - test edit_modal
             app_bs2 = Flask(__name__)