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
e81c1312
Commit
e81c1312
authored
Aug 26, 2012
by
Serge S. Koval
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed model conversion logic if property is not column
parent
bde254c8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
26 deletions
+29
-26
form.py
flask_admin/contrib/sqlamodel/form.py
+29
-26
No files found.
flask_admin/contrib/sqlamodel/form.py
View file @
e81c1312
...
@@ -79,6 +79,11 @@ class AdminModelConverter(ModelConverterBase):
...
@@ -79,6 +79,11 @@ class AdminModelConverter(ModelConverterBase):
else
:
else
:
# Ignore pk/fk
# Ignore pk/fk
if
hasattr
(
prop
,
'columns'
):
if
hasattr
(
prop
,
'columns'
):
# Check if more than one column mapped to the property
if
len
(
prop
.
columns
)
!=
1
:
raise
TypeError
(
'Can not convert multiple-column properties (
%
s.
%
s)'
%
(
model
,
prop
.
key
))
# Grab column
column
=
prop
.
columns
[
0
]
column
=
prop
.
columns
[
0
]
# Do not display foreign keys - use relations
# Do not display foreign keys - use relations
...
@@ -113,10 +118,6 @@ class AdminModelConverter(ModelConverterBase):
...
@@ -113,10 +118,6 @@ class AdminModelConverter(ModelConverterBase):
# Apply label
# Apply label
kwargs
[
'label'
]
=
self
.
_get_label
(
prop
.
key
,
kwargs
)
kwargs
[
'label'
]
=
self
.
_get_label
(
prop
.
key
,
kwargs
)
# Check if more than one column mapped to the property
if
len
(
prop
.
columns
)
!=
1
:
raise
TypeError
(
'Can not convert multiple-column properties (
%
s.
%
s)'
%
(
model
,
prop
.
key
))
# Figure out default value
# Figure out default value
default
=
getattr
(
column
,
'default'
,
None
)
default
=
getattr
(
column
,
'default'
,
None
)
...
@@ -147,6 +148,8 @@ class AdminModelConverter(ModelConverterBase):
...
@@ -147,6 +148,8 @@ class AdminModelConverter(ModelConverterBase):
return
converter
(
model
=
model
,
mapper
=
mapper
,
prop
=
prop
,
return
converter
(
model
=
model
,
mapper
=
mapper
,
prop
=
prop
,
column
=
column
,
field_args
=
kwargs
)
column
=
column
,
field_args
=
kwargs
)
return
None
@
classmethod
@
classmethod
def
_string_common
(
cls
,
column
,
field_args
,
**
extra
):
def
_string_common
(
cls
,
column
,
field_args
,
**
extra
):
if
column
.
type
.
length
:
if
column
.
type
.
length
:
...
...
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