Commit 0ef60dd5 authored by Vlad Chursin's avatar Vlad Chursin

1. file admin default sort was not used

2. sort files exception
parent f5628d79
...@@ -818,8 +818,8 @@ class BaseFileAdmin(BaseView, ActionsMixin): ...@@ -818,8 +818,8 @@ class BaseFileAdmin(BaseView, ActionsMixin):
if self.is_accessible_path(rel_path): if self.is_accessible_path(rel_path):
items.append(item) items.append(item)
sort_column = request.args.get('sort', None, type=str) sort_column = request.args.get('sort', None, type=str) or self.default_sort_column
sort_desc = request.args.get('desc', 0, type=int) sort_desc = request.args.get('desc', 0, type=int) or self.default_desc
if sort_column is None: if sort_column is None:
# Sort by name # Sort by name
...@@ -827,7 +827,7 @@ class BaseFileAdmin(BaseView, ActionsMixin): ...@@ -827,7 +827,7 @@ class BaseFileAdmin(BaseView, ActionsMixin):
# Sort by type # Sort by type
items.sort(key=itemgetter(2), reverse=True) items.sort(key=itemgetter(2), reverse=True)
# Sort by modified date # Sort by modified date
items.sort(key=lambda x: (x[0], x[1], x[2], x[3], datetime.fromtimestamp(x[4])), reverse=True) # items.sort(key=lambda x: (x[0], x[1], x[2], x[3], datetime.fromtimestamp(x[4])), reverse=True)
else: else:
column_index = self.possible_columns.index(sort_column) column_index = self.possible_columns.index(sort_column)
items.sort(key=itemgetter(column_index), reverse=sort_desc) items.sort(key=itemgetter(column_index), reverse=sort_desc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment