WIP

Icinga · Feb 9, 2024 · ba4f04f · ba4f04f
1 parent 29a90f6
commit ba4f04f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 38 deletions.
diff --git a/application/controllers/IssuesController.php b/application/controllers/IssuesController.php
@@ -77,11 +77,11 @@ protected function requireMonitoringInfo()
 /*            if (Module::exists('icingadb') && $this->hasPermission()) {
 
             }*/
-            $auth = Auth::getInstance();
+            $user = Auth::getInstance()->getUser();
             $authenticated = Icinga::app()->isWeb() && Auth::getInstance()->isAuthenticated();
             if (
                 ! Module::exists('monitoring')
-                || ($authenticated && ! $auth->getUser()->can('module/monitoring'))
+                || ($authenticated && $user && $user->can('modules/monitoring'))
             ) {
                 $backend = new IcingadbBackend();
             } else {

diff --git a/library/Jira/Web/RenderingHelper.php b/library/Jira/Web/RenderingHelper.php
@@ -47,20 +47,6 @@ public function linkToMonitoringHost($host)
         ]);
     }
 
-    protected function useIcingaDbAsBackend()
-    {
-        $auth = Auth::getInstance();
-        $authenticated = Icinga::app()->isWeb() && Auth::getInstance()->isAuthenticated();
-        if (
-            ! Module::exists('monitoring')
-            || ($authenticated && ! $auth->getUser()->can('module/monitoring'))
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
     public function linkToMonitoringService($host, $service)
     {
         if (Module::exists('icingadb') && IcingadbSupport::useIcingaDbAsBackend()) {

diff --git a/library/Jira/Web/Table/IssueDetails.php b/library/Jira/Web/Table/IssueDetails.php
@@ -88,12 +88,16 @@ protected function assemble()
             $this->translate('Created') => $helper->shortTimeSince($fields->created, false),
         ]);
 
-        $hostLink = null;
-        $serviceLink = null;
+        $summary = $this->getSummary(
+            $fields->summary,
+            $fields->created,
+            $fields->description
+        );
+
         if ($this->host !== null) {
             $this->addNameValueRow(
                 $this->translate('Host'),
-                $hostLink
+                $this->getLinkToMonitoringHost()
             );
         }
         if ($this->service !== null) {
@@ -109,19 +113,10 @@ protected function assemble()
             );
         }
 
-        $summary = $this->getSummary(
-
-        );
-
         $this->addComments(array_reverse($fields->comment->comments));
         $this->addComment(
-            $fields->summary,
-            $fields->created,
-            $fields->description
+            $summary
         );
-
-        $hostLink = $this->getLinkToMonitoringHost();
-        $serviceLink = $this->getLinkToMonitoringService();
     }
 
     protected function addWideRow($content)
@@ -136,9 +131,11 @@ protected function addComments($comments)
         foreach ($comments as $comment) {
             if (property_exists($comment, 'author')) {
                 $this->addComment(
-                    $this->formatAuthor($comment->author),
-                    $comment->created,
-                    $comment->body
+                    $this->getSummary(
+                        $this->formatAuthor($comment->author),
+                        $comment->created,
+                        $comment->body
+                    )
                 );
             }
         }
@@ -181,28 +178,28 @@ protected function replaceLinks($string)
         return \preg_replace_callback('/\[([^|]+)\|([^]]+)]/', function ($match) {
             $link = Html::tag('a', ['href' => $match[2], 'target' => '_blank'], $match[1]);
             if ($this->service && $this->service === $match[1]) {
-                $serviceLink = $link;
+                $serviceLink = clone $link;
                 $serviceLink->setContent([new Icon('cog'), $match[1]]);
                 $serviceLink->addAttributes(
                     ['title' => t('Show Icinga Service State')]
                 );
                 $this->setLinkToMonitoringService($serviceLink);
             } else {
-                $hostLink = $link;
+                $hostLink = clone $link;
                 $hostLink->setContent([new Icon('server'), $match[1]]);
                 $hostLink->addAttributes(
                     ['title' => t('Show Icinga Host State')]
                 );
-                $this->setLinkToMonitoringHost($link);
+                $this->setLinkToMonitoringHost($hostLink);
             }
 
             return $link;
         }, $string);
     }
 
-    protected function addComment($author, $time, $body)
+    protected function getSummary($author, $time, $body)
     {
-        return $this->addWideRow([
+        return [
             Html::tag('h3', null, Html::sprintf(
                 '%s: %s',
                 $this->helper->shortTimeSince($time),
@@ -213,7 +210,12 @@ protected function addComment($author, $time, $body)
                 ['class' => 'comment'],
                 $this->formatBody($body)
             ),
-        ]);
+        ];
+    }
+
+    protected function addComment($summary)
+    {
+        return $this->addWideRow($summary);
     }
 
     protected function createNameValueRow($name, $value)