Merge branch 'handle-stale-sort-parameter'

doc/changelog.rst

@@ -6,15 +6,18 @@ next release
 
 * Support nested categories in the navbar menu
 * SQLAlchemy
-  * sort on multiple columns with `column_default_sort`
-  * sort on related models in `column_sortable_list`
-  * fix: inline model forms can now also be used for models with multiple primary keys
-  * support for using mapped `column_property`
+    * sort on multiple columns with `column_default_sort`
+    * sort on related models in `column_sortable_list`
+    * fix: inline model forms can now also be used for models with multiple primary keys
+    * support for using mapped `column_property`
 * Upgrade Leaflet and Leaflet.draw plugins, used for geoalchemy integration
 * Specify `minimum_input_length` for ajax widget
 * Peewee: support composite keys
 * MongoEngine: when searching/filtering the input is now regarded as case-insensitive by default
-* FileAdmin: handle special characters in filename + fix a bug with listing directories on Windows
+* FileAdmin
+    * handle special characters in filename
+    * fix a bug with listing directories on Windows
+    * avoid raising an exception when unknown sort parameter is encountered
 
 1.5.2
 -----

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
 
@@ -208,3 +209,37 @@ class LocalFileAdminTests(Base.FileAdminTests):
 
     def fileadmin_args(self):
         return (self._test_files_root, '/files'), {}
+
+    def test_fileadmin_sort_bogus_url_param(self):
+        fileadmin_class = self.fileadmin_class()
+        fileadmin_args, fileadmin_kwargs = self.fileadmin_args()
+        app, admin = setup()
+
+        class MyFileAdmin(fileadmin_class):
+            editable_extensions = ('txt',)
+
+        view_kwargs = dict(fileadmin_kwargs)
+        view_kwargs.setdefault('name', 'Files')
+        view = MyFileAdmin(*fileadmin_args, **view_kwargs)
+
+        admin.add_view(view)
+
+        client = app.test_client()
+        with open(op.join(self._test_files_root, 'dummy2.txt'), 'w') as fp:
+            # make sure that 'files/dummy2.txt' exists, is newest and has bigger size
+            fp.write('test')
+
+            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'))
+        try:
+            # clean up
+            os.remove(op.join(self._test_files_root, 'dummy2.txt'))
+        except (IOError, OSError):
+            pass