Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
flask-admin
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Python-Dev
flask-admin
Commits
0ef60dd5
Commit
0ef60dd5
authored
Jul 13, 2017
by
Vlad Chursin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. file admin default sort was not used
2. sort files exception
parent
f5628d79
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
__init__.py
flask_admin/contrib/fileadmin/__init__.py
+3
-3
No files found.
flask_admin/contrib/fileadmin/__init__.py
View file @
0ef60dd5
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment