Revert "Adjust command links so that they'll use `service_description'"

This reverts commit cee189a. Conflicts: modules/monitoring/application/views/scripts/list/comments.phtml modules/monitoring/application/views/scripts/list/downtimes.phtml
Icinga · Apr 20, 2015 · 9bbb23a · 9bbb23a
1 parent cc573c1
commit 9bbb23a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -91,8 +91,8 @@ if (count($comments) === 0) {
             );
           } else {
             $delCommentForm->setAction($this->url('monitoring/service/delete-comment', array(
-                'host_name'             => $comment->host_name,
-                'service_description'   => $comment->service_description
+                'host_name' => $comment->host_name,
+                'service'   => $comment->service_description
             )));
           }
           echo $delCommentForm;

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -117,8 +117,8 @@ if (count($downtimes) === 0) {
             $delDowntimeForm->setAction($this->url('monitoring/host/delete-downtime', array('host_name' => $downtime->host_name)));
           } else {
             $delDowntimeForm->setAction($this->url('monitoring/service/delete-downtime', array(
-                'host_name'             => $downtime->host_name,
-                'service_description'   => $downtime->service_description
+                'host_name' => $downtime->host_name,
+                'service'   => $downtime->service_description
             )));
           }
           echo $delDowntimeForm;

diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -31,7 +31,7 @@ if ($object->acknowledged): ?>
                 } else {
                     $ackLink = $this->href(
                         'monitoring/service/acknowledge-problem',
-                        array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName())
+                        array('host_name' => $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
@@ -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_description' => $object->getName()),
+                  array('host_name' => $object->getHost()->getName(), 'service' => $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
@@ -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_description' => $object->getName()),
+                    array('host_name' => $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
@@ -18,7 +18,7 @@
                 echo $this->qlink(
                     $this->translate('Add comment'),
                     'monitoring/service/add-comment',
-                    array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName()),
+                    array('host_name' => $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
@@ -20,7 +20,7 @@
                 echo $this->qlink(
                     $this->translate('Schedule downtime'),
                     'monitoring/service/schedule-downtime',
-                    array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName()),
+                    array('host_name' => $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
@@ -10,7 +10,7 @@
       } else {
           $ackLink = $this->href(
               'monitoring/service/send-custom-notification',
-              array('host_name' => $object->getHost()->getName(), 'service_description' => $object->getName())
+              array('host_name' => $object->getHost()->getName(), 'service' => $object->getName())
           );
       }
       ?>