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

return sending queue object for standard / newsletter for automated\n- bugfix loading screen not going away\n- fixed not being used in sending queue endpoint

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-08-09 16:52:04 +02:00
parent 22e8e34213
commit f690e1a095
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/API/Endpoints/SendingQueue.php
View File

@ -21,8 +21,7 @@ class SendingQueue extends APIEndpoint {
$id = (isset($data['id']) ? (int)$data['id'] : null);
// check that the newsletter exists
$newsletter = Newsletter::filter('filterWithOptions')
->findOne($data['id']);
$newsletter = Newsletter::filter('filterWithOptions')->findOne($id);
if($newsletter === false) {
return $this->errorResponse(array(
@ -118,7 +117,7 @@ class SendingQueue extends APIEndpoint {
return $this->errorResponse($errors);
} else {
return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray()
$newsletter->getQueue()->asArray()
);
}
}
@ -142,7 +141,7 @@ class SendingQueue extends APIEndpoint {
} else {
$queue->pause();
return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray()
$newsletter->getQueue()->asArray()
);
}
}
@ -166,7 +165,7 @@ class SendingQueue extends APIEndpoint {
} else {
$queue->resume();
return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray()
$newsletter->getQueue()->asArray()
);
}
}