tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 08:44:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename Notifiation::getMessages() to popMessages()

Browse Source 
Because the call to popMessages()--before getMessages()--automatically resets the notification messages on the instance, popMessages() is a much better name for the method.

refs #9660
This commit is contained in:
Eric Lippmann 2015-07-30 13:45:39 +02:00
parent d545e1f7d1
commit 81aad9d6a6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/layouts/scripts/body.phtml
View File

@ -51,7 +51,7 @@ if (Auth::getInstance()->isAuthenticated()):
<ul id="notifications"><?php <ul id="notifications"><?php
$notifications = Notification::getInstance(); $notifications = Notification::getInstance();
if ($notifications->hasMessages()) { if ($notifications->hasMessages()) {
foreach ($notifications->getMessages() as $m) { foreach ($notifications->popMessages() as $m) {
echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>'; echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
} }
} }

2
library/Icinga/Web/Controller/ActionController.php
View File

@ -455,7 +455,7 @@ class ActionController extends Zend_Controller_Action
$notifications = Notification::getInstance(); $notifications = Notification::getInstance();
if ($notifications->hasMessages()) { if ($notifications->hasMessages()) {
$notificationList = array(); $notificationList = array();
foreach ($notifications->getMessages() as $m) { foreach ($notifications->popMessages() as $m) {
$notificationList[] = rawurlencode($m->type . ' ' . $m->message); $notificationList[] = rawurlencode($m->type . ' ' . $m->message);
} }
$resp->setHeader('X-Icinga-Notification', implode('&', $notificationList), true); $resp->setHeader('X-Icinga-Notification', implode('&', $notificationList), true);

4
library/Icinga/Web/Notification.php
View File

@ -183,11 +183,11 @@ class Notification
} }
/** /**
* Get the notification messages * Pop the notification messages
* *
* @return array * @return array
*/ */
public function getMessages() public function popMessages()
{ {
$messages = $this->messages; $messages = $this->messages;
$this->messages = array(); $this->messages = array();

4
modules/setup/application/views/scripts/index/index.phtml
View File

@ -19,7 +19,7 @@ $maxProgress = @max(array_keys(array_filter(
$notifications = Notification::getInstance(); $notifications = Notification::getInstance();
if ($notifications->hasMessages()) { if ($notifications->hasMessages()) {
foreach ($notifications->getMessages() as $m) { foreach ($notifications->popMessages() as $m) {
echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>'; echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
} }
} }
@ -135,4 +135,4 @@ if ($notifications->hasMessages()) {
<?= $this->render('index/parts/wizard.phtml'); ?> <?= $this->render('index/parts/wizard.phtml'); ?>
<?php endif ?> <?php endif ?>
</div> </div>
</div> </div>