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
624b0d8e
Commit
624b0d8e
authored
Mar 26, 2016
by
Paul Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1213 from vToMy/bug_fixes
Fixed bugs
parents
5a66f8a4
405d6eac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
filters.py
flask_admin/model/filters.py
+2
-2
test_base.py
flask_admin/tests/test_base.py
+3
-1
No files found.
flask_admin/model/filters.py
View file @
624b0d8e
...
@@ -160,7 +160,7 @@ class BaseDateBetweenFilter(BaseFilter):
...
@@ -160,7 +160,7 @@ class BaseDateBetweenFilter(BaseFilter):
Apply method is different for each back-end.
Apply method is different for each back-end.
"""
"""
def
clean
(
self
,
value
):
def
clean
(
self
,
value
):
return
[
datetime
.
datetime
.
strptime
(
range
,
'
%
Y-
%
m-
%
d'
)
return
[
datetime
.
datetime
.
strptime
(
range
,
'
%
Y-
%
m-
%
d'
)
.
date
()
for
range
in
value
.
split
(
' to '
)]
for
range
in
value
.
split
(
' to '
)]
def
operation
(
self
):
def
operation
(
self
):
...
@@ -168,7 +168,7 @@ class BaseDateBetweenFilter(BaseFilter):
...
@@ -168,7 +168,7 @@ class BaseDateBetweenFilter(BaseFilter):
def
validate
(
self
,
value
):
def
validate
(
self
,
value
):
try
:
try
:
value
=
[
datetime
.
datetime
.
strptime
(
range
,
'
%
Y-
%
m-
%
d'
)
value
=
[
datetime
.
datetime
.
strptime
(
range
,
'
%
Y-
%
m-
%
d'
)
.
date
()
for
range
in
value
.
split
(
' to '
)]
for
range
in
value
.
split
(
' to '
)]
# if " to " is missing, fail validation
# if " to " is missing, fail validation
# sqlalchemy's .between() will not work if end date is before start date
# sqlalchemy's .between() will not work if end date is before start date
...
...
flask_admin/tests/test_base.py
View file @
624b0d8e
import
os
from
nose.tools
import
ok_
,
eq_
,
raises
from
nose.tools
import
ok_
,
eq_
,
raises
from
flask
import
Flask
,
request
,
abort
,
url_for
from
flask
import
Flask
,
request
,
abort
,
url_for
...
@@ -157,7 +159,7 @@ def test_baseview_registration():
...
@@ -157,7 +159,7 @@ def test_baseview_registration():
# Verify generated blueprint properties
# Verify generated blueprint properties
eq_
(
bp
.
name
,
view
.
endpoint
)
eq_
(
bp
.
name
,
view
.
endpoint
)
eq_
(
bp
.
url_prefix
,
view
.
url
)
eq_
(
bp
.
url_prefix
,
view
.
url
)
eq_
(
bp
.
template_folder
,
'templates/bootstrap2'
)
eq_
(
bp
.
template_folder
,
os
.
path
.
join
(
'templates'
,
'bootstrap2'
)
)
eq_
(
bp
.
static_folder
,
view
.
static_folder
)
eq_
(
bp
.
static_folder
,
view
.
static_folder
)
# Verify customizations
# Verify customizations
...
...
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