Unverified Commit 519ab4d2 authored by Serge S. Koval's avatar Serge S. Koval Committed by GitHub

Merge pull request #1732 from flask-admin/fix-batch-actions

Fix batch action regression
parents ce6e6b48 2a1728ee
...@@ -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',
......
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()));
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment