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
8293f443
Commit
8293f443
authored
Jan 21, 2015
by
Serge S. Koval
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed possible crash when empty model id is passed
parent
156541a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
base.py
flask_admin/model/base.py
+4
-3
helpers.py
flask_admin/model/helpers.py
+7
-1
No files found.
flask_admin/model/base.py
View file @
8293f443
...
@@ -948,7 +948,7 @@ class BaseModelView(BaseView, ActionsMixin):
...
@@ -948,7 +948,7 @@ class BaseModelView(BaseView, ActionsMixin):
class
DeleteForm
(
self
.
form_base_class
):
class
DeleteForm
(
self
.
form_base_class
):
id
=
HiddenField
(
validators
=
[
Required
()])
id
=
HiddenField
(
validators
=
[
Required
()])
url
=
HiddenField
()
url
=
HiddenField
()
return
DeleteForm
return
DeleteForm
def
create_form
(
self
,
obj
=
None
):
def
create_form
(
self
,
obj
=
None
):
...
@@ -1370,7 +1370,7 @@ class BaseModelView(BaseView, ActionsMixin):
...
@@ -1370,7 +1370,7 @@ class BaseModelView(BaseView, ActionsMixin):
form
=
self
.
list_form
()
form
=
self
.
list_form
()
else
:
else
:
form
=
None
form
=
None
if
self
.
can_delete
:
if
self
.
can_delete
:
delete_form
=
self
.
delete_form
()
delete_form
=
self
.
delete_form
()
else
:
else
:
...
@@ -1543,7 +1543,8 @@ class BaseModelView(BaseView, ActionsMixin):
...
@@ -1543,7 +1543,8 @@ class BaseModelView(BaseView, ActionsMixin):
form
=
self
.
delete_form
()
form
=
self
.
delete_form
()
if
self
.
validate_form
(
form
):
if
self
.
validate_form
(
form
):
id
=
form
.
id
.
data
# id is Required()
# id is Required()
id
=
form
.
id
.
data
model
=
self
.
get_one
(
id
)
model
=
self
.
get_one
(
id
)
...
...
flask_admin/model/helpers.py
View file @
8293f443
...
@@ -25,7 +25,13 @@ def get_mdict_item_or_list(mdict, key):
...
@@ -25,7 +25,13 @@ def get_mdict_item_or_list(mdict, key):
if
hasattr
(
mdict
,
'getlist'
):
if
hasattr
(
mdict
,
'getlist'
):
v
=
mdict
.
getlist
(
key
)
v
=
mdict
.
getlist
(
key
)
if
len
(
v
)
==
1
:
if
len
(
v
)
==
1
:
return
v
[
0
]
value
=
v
[
0
]
# Special case for empty strings, treat them as "no-value"
if
value
==
''
:
value
=
None
return
value
elif
len
(
v
)
==
0
:
elif
len
(
v
)
==
0
:
return
None
return
None
else
:
else
:
...
...
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