mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-03 06:38:57 +02:00
MINOR Fixed merge error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92842 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
b943a65f37
commit
c18923040d
@ -43,7 +43,7 @@ abstract class CMSBatchAction extends Object {
|
|||||||
* }
|
* }
|
||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
public function batchaction(DataObjectSet $pages, $helperMethod, $successMessage) {
|
public function batchaction(DataObjectSet $pages, $helperMethod, $successMessage, $arguments = array()) {
|
||||||
$failures = 0;
|
$failures = 0;
|
||||||
$status = array('modified' => array(), 'error' => array());
|
$status = array('modified' => array(), 'error' => array());
|
||||||
|
|
||||||
@ -67,7 +67,7 @@ abstract class CMSBatchAction extends Object {
|
|||||||
|
|
||||||
Controller::curr()->getResponse()->setStatusCode(
|
Controller::curr()->getResponse()->setStatusCode(
|
||||||
200,
|
200,
|
||||||
sprintf($successMessage, $pages->Count())
|
sprintf($successMessage, $pages->Count(), count($status['error']))
|
||||||
);
|
);
|
||||||
|
|
||||||
return Convert::raw2json($status);
|
return Convert::raw2json($status);
|
||||||
|
Loading…
Reference in New Issue
Block a user