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
528641b6
Commit
528641b6
authored
Mar 26, 2012
by
Serge S. Koval
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Non-nullable fields will have Required() validator by default.
parent
b82188f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
simple.py
examples/sqla/simple.py
+1
-1
sqlamodel.py
flask_adminex/ext/sqlamodel.py
+9
-1
No files found.
examples/sqla/simple.py
View file @
528641b6
...
@@ -30,7 +30,7 @@ class User(db.Model):
...
@@ -30,7 +30,7 @@ class User(db.Model):
class
Post
(
db
.
Model
):
class
Post
(
db
.
Model
):
id
=
db
.
Column
(
db
.
Integer
,
primary_key
=
True
)
id
=
db
.
Column
(
db
.
Integer
,
primary_key
=
True
)
title
=
db
.
Column
(
db
.
String
(
120
))
title
=
db
.
Column
(
db
.
String
(
120
))
text
=
db
.
Column
(
db
.
Text
)
text
=
db
.
Column
(
db
.
Text
,
nullable
=
False
)
date
=
db
.
Column
(
db
.
DateTime
)
date
=
db
.
Column
(
db
.
DateTime
)
user_id
=
db
.
Column
(
db
.
Integer
(),
db
.
ForeignKey
(
User
.
id
))
user_id
=
db
.
Column
(
db
.
Integer
(),
db
.
ForeignKey
(
User
.
id
))
...
...
flask_adminex/ext/sqlamodel.py
View file @
528641b6
...
@@ -2,7 +2,7 @@ from sqlalchemy.orm.attributes import InstrumentedAttribute
...
@@ -2,7 +2,7 @@ from sqlalchemy.orm.attributes import InstrumentedAttribute
from
sqlalchemy.orm.exc
import
NoResultFound
from
sqlalchemy.orm.exc
import
NoResultFound
from
sqlalchemy.sql.expression
import
desc
from
sqlalchemy.sql.expression
import
desc
from
wtforms
import
ValidationError
,
fields
from
wtforms
import
ValidationError
,
fields
,
validators
from
wtforms.ext.sqlalchemy.orm
import
model_form
,
converts
,
ModelConverter
from
wtforms.ext.sqlalchemy.orm
import
model_form
,
converts
,
ModelConverter
from
wtforms.ext.sqlalchemy.fields
import
QuerySelectField
,
QuerySelectMultipleField
from
wtforms.ext.sqlalchemy.fields
import
QuerySelectField
,
QuerySelectMultipleField
...
@@ -81,6 +81,11 @@ class AdminModelConverter(ModelConverter):
...
@@ -81,6 +81,11 @@ class AdminModelConverter(ModelConverter):
'query_factory'
:
lambda
:
self
.
view
.
session
.
query
(
remote_model
)
'query_factory'
:
lambda
:
self
.
view
.
session
.
query
(
remote_model
)
})
})
if
local_column
.
nullable
:
kwargs
[
'validators'
]
.
append
(
validators
.
Optional
())
else
:
kwargs
[
'validators'
]
.
append
(
validators
.
Required
())
if
prop
.
direction
.
name
==
'MANYTOONE'
:
if
prop
.
direction
.
name
==
'MANYTOONE'
:
return
QuerySelectField
(
widget
=
form
.
ChosenSelectWidget
(),
return
QuerySelectField
(
widget
=
form
.
ChosenSelectWidget
(),
**
kwargs
)
**
kwargs
)
...
@@ -110,6 +115,9 @@ class AdminModelConverter(ModelConverter):
...
@@ -110,6 +115,9 @@ class AdminModelConverter(ModelConverter):
model
,
model
,
column
))
column
))
if
not
column
.
nullable
:
kwargs
[
'validators'
]
.
append
(
validators
.
Required
())
# Apply label
# Apply label
kwargs
[
'label'
]
=
self
.
_get_label
(
prop
.
key
,
kwargs
)
kwargs
[
'label'
]
=
self
.
_get_label
(
prop
.
key
,
kwargs
)
...
...
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