Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

fix bulk actions and messages

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-09-06 17:21:15 +02:00
parent f650455a90
commit 4a72995bf4
17 changed files with 207 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/API/Endpoints/Forms.php
View File

@ -273,8 +273,8 @@ class Forms extends APIEndpoint {
'\MailPoet\Models\Form',
$data
);
$count = $bulk_action->apply();
return $this->successResponse(null, array('count' => $count));
$meta = $bulk_action->apply();
return $this->successResponse(null, $meta);
} catch(\Exception $e) {
return $this->errorResponse(array(
$e->getCode() => $e->getMessage()

11
lib/API/Endpoints/Newsletters.php
View File

@ -97,8 +97,6 @@ class Newsletters extends APIEndpoint {
}
function setStatus($data = array()) {
$id = (isset($data['id'])) ? (int)$data['id'] : false;
$newsletter = Newsletter::findOne($id);
$status = (isset($data['status']) ? $data['status'] : null);
if(!$status) {
@ -107,6 +105,9 @@ class Newsletters extends APIEndpoint {
));
}
$id = (isset($data['id'])) ? (int)$data['id'] : false;
$newsletter = Newsletter::findOne($id);
if($newsletter === false) {
return $this->errorResponse(array(
APIError::NOT_FOUND => __('This newsletter does not exist.')
@ -120,7 +121,7 @@ class Newsletters extends APIEndpoint {
return $this->errorResponse($errors);
} else {
return $this->successResponse(
$newsletter->asArray()
Newsletter::findOne($newsletter->id)->asArray()
);
}
}
@ -340,8 +341,8 @@ class Newsletters extends APIEndpoint {
'\MailPoet\Models\Newsletter',
$data
);
$count = $bulk_action->apply();
return $this->successResponse(null, array('count' => $count));
$meta = $bulk_action->apply();
return $this->successResponse(null, $meta);
} catch(\Exception $e) {
return $this->errorResponse(array(
$e->getCode() => $e->getMessage()

4
lib/API/Endpoints/Segments.php
View File

@ -148,8 +148,8 @@ class Segments extends APIEndpoint {
'\MailPoet\Models\Segment',
$data
);
$count = $bulk_action->apply();
return $this->successResponse(null, array('count' => $count));
$meta = $bulk_action->apply();
return $this->successResponse(null, $meta);
} catch(\Exception $e) {
return $this->errorResponse(array(
$e->getCode() => $e->getMessage()

4
lib/API/Endpoints/Subscribers.php
View File

@ -201,8 +201,8 @@ class Subscribers extends APIEndpoint {
'\MailPoet\Models\Subscriber',
$data
);
$count = $bulk_action->apply();
return $this->successResponse(null, array('count' => $count));
$meta = $bulk_action->apply();
return $this->successResponse(null, $meta);
} catch(\Exception $e) {
return $this->errorResponse(array(
$e->getCode() => $e->getMessage()