Merge pull request #698 from msempere/master

Sorting by modified date

flask_admin/contrib/fileadmin.py

@@ -4,6 +4,7 @@ import platform
 import re
 import shutil
 
+from datetime import datetime
 from operator import itemgetter
 from werkzeug import secure_filename
 
@@ -353,6 +354,8 @@ class FileAdmin(BaseView, ActionsMixin):
     def is_action_allowed(self, name):
         if name == 'delete' and not self.can_delete:
             return False
+        elif name == 'edit' and len(self.editable_extensions) == 0:
+            return False
 
         return True
 
@@ -459,7 +462,7 @@ class FileAdmin(BaseView, ActionsMixin):
             rel_path = op.join(path, f)
 
             if self.is_accessible_path(rel_path):
-                items.append((f, rel_path, op.isdir(fp), op.getsize(fp)))
+                items.append((f, rel_path, op.isdir(fp), op.getsize(fp), op.getmtime(fp)))
 
         # Sort by name
         items.sort(key=itemgetter(0))
@@ -467,6 +470,9 @@ class FileAdmin(BaseView, ActionsMixin):
         # Sort by type
         items.sort(key=itemgetter(2), reverse=True)
 
+        # Sort by modified date
+        items.sort(key=lambda values: (values[0], values[1], values[2], values[3], datetime.fromtimestamp(values[4])), reverse=True)
+
         # Generate breadcrumbs
         accumulator = []
         breadcrumbs = []

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

@@ -37,7 +37,7 @@
                 {% endblock %}
             </tr>
         </thead>
-        {% for name, path, is_dir, size in items %}
+        {% for name, path, is_dir, size, date in items %}
         <tr>
             {% block list_row scoped %}
             {% if actions %}

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

@@ -37,7 +37,7 @@
                 {% endblock %}
             </tr>
         </thead>
-        {% for name, path, is_dir, size in items %}
+        {% for name, path, is_dir, size, date in items %}
         <tr>
             {% block list_row scoped %}
             {% if actions %}