From 894457a1c13dd362b6f91d6094a5e22b6d9540ca Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 20 Apr 2015 16:11:08 +0200 Subject: [PATCH] Revert "Adjust command links so that they'll use `host_name' instead of `host'" This reverts commit b9aee47d1f44893ef953bf9168e21f368b95ed7f. Conflicts: modules/monitoring/application/views/scripts/list/comments.phtml modules/monitoring/application/views/scripts/list/downtimes.phtml --- .../monitoring/application/views/scripts/list/comments.phtml | 4 ++-- .../monitoring/application/views/scripts/list/downtimes.phtml | 4 ++-- .../views/scripts/show/components/acknowledgement.phtml | 4 ++-- .../views/scripts/show/components/checkstatistics.phtml | 4 ++-- .../application/views/scripts/show/components/command.phtml | 4 ++-- .../application/views/scripts/show/components/comments.phtml | 4 ++-- .../application/views/scripts/show/components/downtime.phtml | 4 ++-- .../views/scripts/show/components/notifications.phtml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml index ee6302fef..9f383345c 100644 --- a/modules/monitoring/application/views/scripts/list/comments.phtml +++ b/modules/monitoring/application/views/scripts/list/comments.phtml @@ -87,11 +87,11 @@ if (count($comments) === 0) { $delCommentForm->populate(array('comment_id' => $comment->id, 'redirect' => $this->url)); if ($comment->objecttype === 'host') { $delCommentForm->setAction( - $this->url('monitoring/host/delete-comment', array('host_name' => $comment->host_name)) + $this->url('monitoring/host/delete-comment', array('host' => $comment->host_name)) ); } else { $delCommentForm->setAction($this->url('monitoring/service/delete-comment', array( - 'host_name' => $comment->host_name, + 'host' => $comment->host_name, 'service' => $comment->service_description ))); } diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml index 3bab05104..3f882a733 100644 --- a/modules/monitoring/application/views/scripts/list/downtimes.phtml +++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml @@ -114,10 +114,10 @@ if (count($downtimes) === 0) { $delDowntimeForm = clone $delDowntimeForm; $delDowntimeForm->populate(array('downtime_id' => $downtime->id, 'redirect' => $this->url)); if (! $isService) { - $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host_name' => $downtime->host_name))); + $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host' => $downtime->host_name))); } else { $delDowntimeForm->setAction($this->url('monitoring/service/delete-downtime', array( - 'host_name' => $downtime->host_name, + 'host' => $downtime->host_name, 'service' => $downtime->service_description ))); } diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml index 588be561c..e7b79354d 100644 --- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml +++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml @@ -26,12 +26,12 @@ if ($object->acknowledged): ?> if ($object->getType() === $object::TYPE_HOST) { $ackLink = $this->href( 'monitoring/host/acknowledge-problem', - array('host_name' => $object->getName()) + array('host' => $object->getName()) ); } else { $ackLink = $this->href( 'monitoring/service/acknowledge-problem', - array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()) + array('host' => $object->getHost()->getName(), 'service' => $object->getName()) ); } ?> diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml index ef1432565..2a4e4b033 100644 --- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml +++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml @@ -31,7 +31,7 @@ if ($object->getType() === $object::TYPE_HOST) { echo $this->qlink( $this->translate('Reschedule'), 'monitoring/service/reschedule-check', - array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()), + array('host' => $object->getHost()->getName(), 'service' => $object->getName()), array( 'icon' => 'reschedule', 'data-base-target' => '_self', @@ -44,7 +44,7 @@ if ($object->getType() === $object::TYPE_HOST) { echo $this->qlink( $this->translate('Reschedule'), 'monitoring/host/reschedule-check', - array('host_name' => $object->getName()), + array('host' => $object->getName()), array( 'icon' => 'reschedule', 'data-base-target' => '_self', diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml index 3068c8e1d..d7fca7cfa 100644 --- a/modules/monitoring/application/views/scripts/show/components/command.phtml +++ b/modules/monitoring/application/views/scripts/show/components/command.phtml @@ -15,7 +15,7 @@ $command = array_shift($parts); echo $this->qlink( $this->translate('Process check result'), 'monitoring/host/process-check-result', - array('host_name' => $object->getName()), + array('host' => $object->getName()), array( 'icon' => 'reply', 'data-base-target' => '_self', @@ -26,7 +26,7 @@ $command = array_shift($parts); echo $this->qlink( $this->translate('Process check result'), 'monitoring/service/process-check-result', - array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()), + array('host' => $object->getHost()->getName(), 'service' => $object->getName()), array( 'icon' => 'reply', 'data-base-target' => '_self', diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml index adeef6200..5a4d351c0 100644 --- a/modules/monitoring/application/views/scripts/show/components/comments.phtml +++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml @@ -7,7 +7,7 @@ echo $this->qlink( $this->translate('Add comment'), 'monitoring/host/add-comment', - array('host_name' => $object->getName()), + array('host' => $object->getName()), array( 'icon' => 'comment', 'data-base-target' => '_self', @@ -18,7 +18,7 @@ echo $this->qlink( $this->translate('Add comment'), 'monitoring/service/add-comment', - array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()), + array('host' => $object->getHost()->getName(), 'service' => $object->getName()), array( 'icon' => 'comment', 'data-base-target' => '_self', diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml index abb150892..b338f8a71 100644 --- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml +++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml @@ -7,7 +7,7 @@ echo $this->qlink( $this->translate('Schedule downtime'), 'monitoring/host/schedule-downtime', - array('host_name' => $object->getName()), + array('host' => $object->getName()), array( 'icon' => 'plug', 'data-base-target' => '_self', @@ -20,7 +20,7 @@ echo $this->qlink( $this->translate('Schedule downtime'), 'monitoring/service/schedule-downtime', - array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()), + array('host' => $object->getHost()->getName(), 'service' => $object->getName()), array( 'icon' => 'plug', 'data-base-target' => '_self', diff --git a/modules/monitoring/application/views/scripts/show/components/notifications.phtml b/modules/monitoring/application/views/scripts/show/components/notifications.phtml index fa4314620..af57eb934 100644 --- a/modules/monitoring/application/views/scripts/show/components/notifications.phtml +++ b/modules/monitoring/application/views/scripts/show/components/notifications.phtml @@ -5,12 +5,12 @@ if ($object->getType() === $object::TYPE_HOST) { $ackLink = $this->href( 'monitoring/host/send-custom-notification', - array('host_name' => $object->getName()) + array('host' => $object->getName()) ); } else { $ackLink = $this->href( 'monitoring/service/send-custom-notification', - array('host_name' => $object->getHost()->getName(), 'service' => $object->getName()) + array('host' => $object->getHost()->getName(), 'service' => $object->getName()) ); } ?>