Unverified Commit 9fbfb6ea authored by Serge S. Koval's avatar Serge S. Koval Committed by GitHub

Merge pull request #1681 from joost823/master

fileadmin - fix timestamp bug windows
parents 7fa26ab2 92cc581c
......@@ -827,7 +827,7 @@ class BaseFileAdmin(BaseView, ActionsMixin):
# Sort by type
items.sort(key=itemgetter(2), reverse=True)
# 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.utcfromtimestamp(x[4])), reverse=True)
else:
column_index = self.possible_columns.index(sort_column)
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