tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitoring/show/contact: Require `contact_name' instead of `contact' 

refs #8613
This commit is contained in:
Johannes Meyer 2015-04-10 09:39:39 +02:00
parent 3d09615851
commit 3c47ba11eb
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/application/controllers/ShowController.php
View File

@ -112,11 +112,11 @@ class Monitoring_ShowController extends Controller
public function contactAction() public function contactAction()
{ {
$contactName = $this->getParam('contact'); $contactName = $this->getParam('contact_name');
if (! $contactName) { if (! $contactName) {
throw new Zend_Controller_Action_Exception( throw new Zend_Controller_Action_Exception(
$this->translate('The parameter `contact\' is required'), $this->translate('The parameter `contact_name\' is required'),
404 404
); );
} }

2
modules/monitoring/application/views/scripts/list/contactgroups.phtml
View File

@ -24,7 +24,7 @@ foreach ($groupData as $groupName => $groupInfo): ?>
<?= $this->qlink( <?= $this->qlink(
$c->contact_alias, $c->contact_alias,
'monitoring/show/contact', 'monitoring/show/contact',
array('contact' => $c->contact_name), array('contact_name' => $c->contact_name),
array('title' => sprintf( array('title' => sprintf(
$this->translate('Show detailed information about %s'), $this->translate('Show detailed information about %s'),
$c->contact_alias $c->contact_alias

2
modules/monitoring/application/views/scripts/list/contacts.phtml
View File

@ -18,7 +18,7 @@
<strong><?= $this->qlink( <strong><?= $this->qlink(
$contact->contact_name, $contact->contact_name,
'monitoring/show/contact', 'monitoring/show/contact',
array('contact' => $contact->contact_name), array('contact_name' => $contact->contact_name),
array('title' => sprintf( array('title' => sprintf(
$this->translate('Show detailed information about %s'), $this->translate('Show detailed information about %s'),
$contact->contact_alias $contact->contact_alias

2
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -63,7 +63,7 @@ use Icinga\Module\Monitoring\Object\Service;
$this->qlink( $this->qlink(
$notification->notification_contact, $notification->notification_contact,
'monitoring/show/contact', 'monitoring/show/contact',
array('contact' => $notification->notification_contact) array('contact_name' => $notification->notification_contact)
) )
) ?> ) ?>
</small> </small>

2
modules/monitoring/application/views/scripts/show/components/contacts.phtml
View File

@ -7,7 +7,7 @@ if (! empty($object->contacts)) {
$list[] = $this->qlink( $list[] = $this->qlink(
$contact->contact_alias, $contact->contact_alias,
'monitoring/show/contact', 'monitoring/show/contact',
array('contact' => $contact->contact_name), array('contact_name' => $contact->contact_name),
array('title' => sprintf($this->translate('Show detailed information about %s'), $contact->contact_alias)) array('title' => sprintf($this->translate('Show detailed information about %s'), $contact->contact_alias))
); );
} }

2
modules/monitoring/application/views/scripts/show/history.phtml
View File

@ -32,7 +32,7 @@ function contactsLink($match, $view) {
$links[] = $view->qlink( $links[] = $view->qlink(
$contact, $contact,
'monitoring/show/contact', 'monitoring/show/contact',
array('contact' => $contact), array('contact_name' => $contact),
array('title' => sprintf($view->translate('Show detailed information about %s'), $contact)) array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
); );
} }