Merge pull request #1496 from hadleyrich/master

Fix sorting in subdirectories in fileadmin

flask_admin/contrib/fileadmin/__init__.py

@@ -821,6 +821,12 @@ class BaseFileAdmin(BaseView, ActionsMixin):
         sort_column = request.args.get('sort', None, type=str)
         sort_desc = request.args.get('desc', 0, type=int)
 
+        if sort_column is None:
+            if self.default_sort_column:
+                sort_column = self.default_sort_column
+            if self.default_desc:
+                sort_desc = self.default_desc
+
         if sort_column is None:
             # Sort by name
             items.sort(key=itemgetter(0))
@@ -842,13 +848,16 @@ class BaseFileAdmin(BaseView, ActionsMixin):
         else:
             action_form = None
 
-        def sort_url(column, invert=False):
+        def sort_url(column, path, invert=False):
             desc = None
 
+            if not path:
+                path = None
+
             if invert and not sort_desc:
                 desc = 1
 
-            return self.get_url('.index_view', sort=column, desc=desc)
+            return self.get_url('.index_view', path=path, sort=column, desc=desc)
 
         return self.render(self.list_template,
                            dir_path=path,

flask_admin/templates/bootstrap2/admin/file/list.html

@@ -37,7 +37,7 @@
                 <th>
                     {% if admin_view.is_column_sortable(column) %}
                     {% if sort_column == column %}
-                        <a href="{{ sort_url(column, True) }}" title="{{ _gettext('Sort by %(name)s', name=column) }}">
+                        <a href="{{ sort_url(column, dir_path, True) }}" title="{{ _gettext('Sort by %(name)s', name=column) }}">
                             {{ admin_view.column_label(column) }}
                             {% if sort_desc %}
                                 <i class="fa fa-chevron-up icon-chevron-up"></i>
@@ -46,7 +46,7 @@
                             {% endif %}
                         </a>
                     {% else %}
-                        <a href="{{ sort_url(column) }}" title="{{ _gettext('Sort by %(name)s', name=column) }}">{{ admin_view.column_label(column) }}</a>
+                        <a href="{{ sort_url(column, dir_path) }}" title="{{ _gettext('Sort by %(name)s', name=column) }}">{{ admin_view.column_label(column) }}</a>
                     {% endif %}
                     {% else %}
                     {{ _gettext(admin_view.column_label(column)) }}

flask_admin/templates/bootstrap3/admin/file/list.html

@@ -37,7 +37,7 @@
                 <th>
                     {% if admin_view.is_column_sortable(column) %}
                     {% if sort_column == column %}
-                        <a href="{{ sort_url(column, True) }}" title="{{ _gettext('Sort by %(name)s', name=column) }}">
+                        <a href="{{ sort_url(column, dir_path, True) }}" title="{{ _gettext('Sort by %(name)s', name=column) }}">
                             {{ admin_view.column_label(column) }}
                             {% if sort_desc %}
                                 <span class="fa fa-chevron-up glyphicon glyphicon-chevron-up"></span>
@@ -46,7 +46,7 @@
                             {% endif %}
                         </a>
                     {% else %}
-                        <a href="{{ sort_url(column) }}" title="{{ _gettext('Sort by %(name)s', name=column) }}">{{ admin_view.column_label(column) }}</a>
+                        <a href="{{ sort_url(column, dir_path) }}" title="{{ _gettext('Sort by %(name)s', name=column) }}">{{ admin_view.column_label(column) }}</a>
                     {% endif %}
                     {% else %}
                     {{ _gettext(admin_view.column_label(column)) }}
@@ -126,12 +126,12 @@
                 {{ size|filesizeformat }}
             </td>
             {% endif %}
+            {% endif %}
             {% if admin_view.is_column_visible('date') %}
             <td>
                 {{ timestamp_format(date) }}
             </td>
             {% endif %}
-            {% endif %}
             {% endblock %}
         </tr>
         {% endfor %}