tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

api/forms: Use the first success notification as success message

Browse Source 
refs #9606
This commit is contained in:
Eric Lippmann 2015-09-07 13:44:46 +02:00
parent 91b9a83be5
commit b20eb681c0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Web/Form.php
View File

@ -1116,10 +1116,16 @@ class Form extends Zend_Form
if ($this->getIsApiTarget() || $this->getRequest()->isApiRequest()) { if ($this->getIsApiTarget() || $this->getRequest()->isApiRequest()) {
// API targets and API requests will never redirect but immediately respond w/ JSON-encoded // API targets and API requests will never redirect but immediately respond w/ JSON-encoded
// notifications // notifications
$messages = Notification::getInstance()->popMessages(); $notifications = Notification::getInstance()->popMessages();
// @TODO(el): Remove the type from the message $message = null;
foreach ($notifications as $notification) {
if ($notification['type'] === Notification::SUCCESS) {
$message = $notification['message'];
break;
}
}
$this->getResponse()->json() $this->getResponse()->json()
->setSuccessData(array('message' => array_pop($messages))) ->setSuccessData($message !== null ? array('message' => $message) : null)
->sendResponse(); ->sendResponse();
} elseif (! $frameUpload) { } elseif (! $frameUpload) {
$this->getResponse()->redirectAndExit($this->getRedirectUrl()); $this->getResponse()->redirectAndExit($this->getRedirectUrl());