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
23844da4
Unverified
Commit
23844da4
authored
Feb 06, 2018
by
Serge Kozlukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: #1600
https://github.com/flask-admin/flask-admin/issues/1600
parent
06aebf07
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
form.py
flask_admin/contrib/sqla/form.py
+3
-1
view.py
flask_admin/contrib/sqla/view.py
+3
-1
No files found.
flask_admin/contrib/sqla/form.py
View file @
23844da4
...
@@ -154,7 +154,9 @@ class AdminModelConverter(ModelConverterBase):
...
@@ -154,7 +154,9 @@ class AdminModelConverter(ModelConverterBase):
if
len
(
prop
.
columns
)
>
1
:
if
len
(
prop
.
columns
)
>
1
:
columns
=
filter_foreign_columns
(
model
.
__table__
,
prop
.
columns
)
columns
=
filter_foreign_columns
(
model
.
__table__
,
prop
.
columns
)
if
len
(
columns
)
>
1
:
if
len
(
columns
)
==
0
:
return
None
elif
len
(
columns
)
>
1
:
warnings
.
warn
(
'Can not convert multiple-column properties (
%
s.
%
s)'
%
(
model
,
prop
.
key
))
warnings
.
warn
(
'Can not convert multiple-column properties (
%
s.
%
s)'
%
(
model
,
prop
.
key
))
return
None
return
None
...
...
flask_admin/contrib/sqla/view.py
View file @
23844da4
...
@@ -420,7 +420,9 @@ class ModelView(BaseModelView):
...
@@ -420,7 +420,9 @@ class ModelView(BaseModelView):
if
len
(
p
.
columns
)
>
1
:
if
len
(
p
.
columns
)
>
1
:
filtered
=
tools
.
filter_foreign_columns
(
self
.
model
.
__table__
,
p
.
columns
)
filtered
=
tools
.
filter_foreign_columns
(
self
.
model
.
__table__
,
p
.
columns
)
if
len
(
filtered
)
>
1
:
if
len
(
filtered
)
==
0
:
continue
elif
len
(
filtered
)
>
1
:
warnings
.
warn
(
'Can not convert multiple-column properties (
%
s.
%
s)'
%
(
self
.
model
,
p
.
key
))
warnings
.
warn
(
'Can not convert multiple-column properties (
%
s.
%
s)'
%
(
self
.
model
,
p
.
key
))
continue
continue
...
...
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