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
6e1447db
Commit
6e1447db
authored
Nov 06, 2017
by
Kyle Xie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed builds
parent
7777e56e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
.travis.yml
.travis.yml
+4
-0
tools.py
flask_admin/contrib/sqla/tools.py
+4
-4
tox.ini
tox.ini
+1
-1
No files found.
.travis.yml
View file @
6e1447db
...
...
@@ -33,6 +33,10 @@ matrix:
addons
:
postgresql
:
"
9.4"
apt
:
packages
:
-
postgresql-9.4-postgis-2.4
-
postgresql-9.4-postgis-2.4-scripts
services
:
-
postgresql
...
...
flask_admin/contrib/sqla/tools.py
View file @
6e1447db
...
...
@@ -75,14 +75,14 @@ def tuple_operator_in(model_pk, ids):
The returning operator can be used within a filter(), as it is just an or_ operator
"""
l
=
[]
ands
=
[]
for
id
in
ids
:
k
=
[]
for
i
in
range
(
len
(
model_pk
)):
k
.
append
(
eq
(
model_pk
[
i
],
id
[
i
]))
l
.
append
(
and_
(
*
k
))
if
len
(
l
)
>=
1
:
return
or_
(
*
l
)
ands
.
append
(
and_
(
*
k
))
if
len
(
ands
)
>=
1
:
return
or_
(
*
ands
)
else
:
return
None
...
...
tox.ini
View file @
6e1447db
...
...
@@ -8,7 +8,7 @@ skip_missing_interpreters = true
[flake8]
max_line_length
=
120
ignore
=
E402
ignore
=
E402
,E722
[testenv]
usedevelop
=
true
...
...
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