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
dc29c583
Commit
dc29c583
authored
May 16, 2014
by
Sergey Markelov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*) Don't apply filter if the term is empty
see
https://github.com/mrjoes/flask-admin/pull/535
parent
1ca37549
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
18 deletions
+21
-18
ajax.py
flask_admin/contrib/mongoengine/ajax.py
+9
-8
ajax.py
flask_admin/contrib/peewee/ajax.py
+9
-8
ajax.py
flask_admin/contrib/sqla/ajax.py
+3
-2
No files found.
flask_admin/contrib/mongoengine/ajax.py
View file @
dc29c583
...
@@ -50,17 +50,18 @@ class QueryAjaxModelLoader(AjaxModelLoader):
...
@@ -50,17 +50,18 @@ class QueryAjaxModelLoader(AjaxModelLoader):
def
get_list
(
self
,
term
,
offset
=
0
,
limit
=
DEFAULT_PAGE_SIZE
):
def
get_list
(
self
,
term
,
offset
=
0
,
limit
=
DEFAULT_PAGE_SIZE
):
query
=
self
.
model
.
objects
query
=
self
.
model
.
objects
criteria
=
None
if
len
(
term
)
>
0
:
criteria
=
None
for
field
in
self
.
_cached_fields
:
for
field
in
self
.
_cached_fields
:
flt
=
{
u'
%
s__icontains'
%
field
.
name
:
term
}
flt
=
{
u'
%
s__icontains'
%
field
.
name
:
term
}
if
not
criteria
:
if
not
criteria
:
criteria
=
mongoengine
.
Q
(
**
flt
)
criteria
=
mongoengine
.
Q
(
**
flt
)
else
:
else
:
criteria
|=
mongoengine
.
Q
(
**
flt
)
criteria
|=
mongoengine
.
Q
(
**
flt
)
query
=
query
.
filter
(
criteria
)
query
=
query
.
filter
(
criteria
)
if
offset
:
if
offset
:
query
=
query
.
skip
(
offset
)
query
=
query
.
skip
(
offset
)
...
...
flask_admin/contrib/peewee/ajax.py
View file @
dc29c583
...
@@ -52,16 +52,17 @@ class QueryAjaxModelLoader(AjaxModelLoader):
...
@@ -52,16 +52,17 @@ class QueryAjaxModelLoader(AjaxModelLoader):
def
get_list
(
self
,
term
,
offset
=
0
,
limit
=
DEFAULT_PAGE_SIZE
):
def
get_list
(
self
,
term
,
offset
=
0
,
limit
=
DEFAULT_PAGE_SIZE
):
query
=
self
.
model
.
select
()
query
=
self
.
model
.
select
()
stmt
=
None
if
len
(
term
)
>
0
:
for
field
in
self
.
_cached_fields
:
stmt
=
None
q
=
field
**
(
u'
%%%
s
%%
'
%
term
)
for
field
in
self
.
_cached_fields
:
q
=
field
**
(
u'
%%%
s
%%
'
%
term
)
if
stmt
is
None
:
if
stmt
is
None
:
stmt
=
q
stmt
=
q
else
:
else
:
stmt
|=
q
stmt
|=
q
query
=
query
.
where
(
stmt
)
query
=
query
.
where
(
stmt
)
if
offset
:
if
offset
:
query
=
query
.
offset
(
offset
)
query
=
query
.
offset
(
offset
)
...
...
flask_admin/contrib/sqla/ajax.py
View file @
dc29c583
...
@@ -58,8 +58,9 @@ class QueryAjaxModelLoader(AjaxModelLoader):
...
@@ -58,8 +58,9 @@ class QueryAjaxModelLoader(AjaxModelLoader):
def
get_list
(
self
,
term
,
offset
=
0
,
limit
=
DEFAULT_PAGE_SIZE
):
def
get_list
(
self
,
term
,
offset
=
0
,
limit
=
DEFAULT_PAGE_SIZE
):
query
=
self
.
session
.
query
(
self
.
model
)
query
=
self
.
session
.
query
(
self
.
model
)
filters
=
(
field
.
like
(
u'
%%%
s
%%
'
%
term
)
for
field
in
self
.
_cached_fields
)
if
len
(
term
)
>
0
:
query
=
query
.
filter
(
or_
(
*
filters
))
filters
=
(
field
.
like
(
u'
%%%
s
%%
'
%
term
)
for
field
in
self
.
_cached_fields
)
query
=
query
.
filter
(
or_
(
*
filters
))
return
query
.
offset
(
offset
)
.
limit
(
limit
)
.
all
()
return
query
.
offset
(
offset
)
.
limit
(
limit
)
.
all
()
...
...
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