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
519ab4d2
Unverified
Commit
519ab4d2
authored
Oct 23, 2018
by
Serge S. Koval
Committed by
GitHub
Oct 23, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1732 from flask-admin/fix-batch-actions
Fix batch action regression
parents
ce6e6b48
2a1728ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
app.py
examples/sqla/app.py
+1
-0
actions.js
flask_admin/static/admin/js/actions.js
+2
-4
No files found.
examples/sqla/app.py
View file @
519ab4d2
...
@@ -148,6 +148,7 @@ inline_form_options = {
...
@@ -148,6 +148,7 @@ inline_form_options = {
}
}
class
UserAdmin
(
sqla
.
ModelView
):
class
UserAdmin
(
sqla
.
ModelView
):
action_disallowed_list
=
[
'delete'
,
]
column_display_pk
=
True
column_display_pk
=
True
column_list
=
[
column_list
=
[
'id'
,
'id'
,
...
...
flask_admin/static/admin/js/actions.js
View file @
519ab4d2
var
AdminModelActions
=
function
(
actionErrorMessage
,
actionConfirmations
)
{
var
AdminModelActions
=
function
(
actionErrorMessage
,
actionConfirmations
)
{
//
Actions helpers. TODO: Move to separate file
//
batch actions helpers
this
.
execute
=
function
(
name
)
{
this
.
execute
=
function
(
name
)
{
var
selected
=
$
(
'input.action-checkbox:checked'
).
length
;
var
selected
=
$
(
'input.action-checkbox:checked'
).
length
;
...
@@ -48,6 +48,4 @@ var AdminModelActions = function(actionErrorMessage, actionConfirmations) {
...
@@ -48,6 +48,4 @@ var AdminModelActions = function(actionErrorMessage, actionConfirmations) {
});
});
});
});
};
};
if
(
$
(
'#actions_confirmation'
).
length
==
1
)
{
var
modelActions
=
new
AdminModelActions
(
JSON
.
parse
(
$
(
'#message-data'
).
text
()),
JSON
.
parse
(
$
(
'#actions-confirmation-data'
).
text
()));
var
modelActions
=
new
AdminModelActions
(
JSON
.
parse
(
$
(
'#message-data'
).
text
()),
JSON
.
parse
(
$
(
'#actions-confirmation-data'
).
text
()));
}
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