mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-30 05:09:06 +02:00
BUG Fix regressions in changes to batch action feature
This commit is contained in:
parent
953b518403
commit
ca039e15ef
@ -131,7 +131,11 @@ class CMSBatchActionHandler extends RequestHandler {
|
||||
$ids = $this->cleanIDs($csvIDs);
|
||||
|
||||
// Filter by applicable pages
|
||||
$applicableIDs = $actionHandler->applicablePages($ids);
|
||||
if($ids) {
|
||||
$applicableIDs = $actionHandler->applicablePages($ids);
|
||||
} else {
|
||||
$applicableIDs = array();
|
||||
}
|
||||
|
||||
$response = new SS_HTTPResponse(json_encode($applicableIDs));
|
||||
$response->addHeader("Content-type", "application/json");
|
||||
|
@ -339,6 +339,7 @@
|
||||
tree.addClass('multiple');
|
||||
tree.removeClass('draggable');
|
||||
form.serializeFromTree();
|
||||
$('#Form_BatchActionsForm').refreshSelected();
|
||||
} else {
|
||||
tree.removeClass('multiple');
|
||||
tree.addClass('draggable');
|
||||
@ -350,13 +351,6 @@
|
||||
* Class: #Form_BatchActionsForm :select[name=Action]
|
||||
*/
|
||||
$('#Form_BatchActionsForm select[name=Action]').entwine({
|
||||
onmatch: function() {
|
||||
this.trigger('change');
|
||||
this._super();
|
||||
},
|
||||
onunmatch: function() {
|
||||
this._super();
|
||||
},
|
||||
onchange: function(e) {
|
||||
var form = $(e.target.form),
|
||||
btn = form.find(':submit'),
|
||||
|
Loading…
Reference in New Issue
Block a user