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
6878bd38
Commit
6878bd38
authored
Oct 25, 2012
by
Serge S. Koval
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed #102. SQLAlchemy does not like accepting more than one table as parameter to join()
parent
7f46ad22
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
view.py
flask_admin/contrib/sqlamodel/view.py
+8
-6
No files found.
flask_admin/contrib/sqlamodel/view.py
View file @
6878bd38
...
...
@@ -483,8 +483,9 @@ class ModelView(BaseModelView):
if
self
.
_search_supported
and
search
:
# Apply search-related joins
if
self
.
_search_joins
:
for
j
in
self
.
_search_joins
.
values
():
query
=
query
.
join
(
j
)
for
jn
in
self
.
_search_joins
.
values
():
query
=
query
.
join
(
jn
)
joins
=
set
(
self
.
_search_joins
.
keys
())
# Apply terms
...
...
@@ -504,11 +505,12 @@ class ModelView(BaseModelView):
if
self
.
_filter_joins
:
new_joins
=
set
(
self
.
_filter_joins
.
keys
())
-
joins
if
new_joins
:
query
=
query
.
join
(
*
[
self
.
_filter_joins
[
jn
]
for
jn
in
new_joins
])
joins
|=
new_joins
for
jn
in
new_joins
:
query
=
query
.
join
(
self
.
_filter_joins
[
jn
])
joins
|=
new_joins
# Apply filters
# Apply filter
value
s
for
flt
,
value
in
filters
:
query
=
self
.
_filters
[
flt
]
.
apply
(
query
,
value
)
...
...
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