From 2913a4fd44b65a25f5ea9ee9265b70a3ad30166b Mon Sep 17 00:00:00 2001
From: Yonas Habteab <yonas.habteab@icinga.com>
Date: Mon, 4 Apr 2022 09:46:44 +0200
Subject: [PATCH] Fix some logical inconsistencies

---
 application/views/scripts/layout/menu.phtml   | 2 +-
 library/Icinga/Web/Widget/SearchDashboard.php | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/layout/menu.phtml b/application/views/scripts/layout/menu.phtml
index 5ebdaf623..c50a6d2e5 100644
--- a/application/views/scripts/layout/menu.phtml
+++ b/application/views/scripts/layout/menu.phtml
@@ -5,7 +5,7 @@ use Icinga\Web\Widget\SearchDashboard;
 $searchDashboard = new SearchDashboard();
 $searchDashboard->setUser($this->Auth()->getUser());
 
-if (! $searchDashboard->search('dummy')->getActiveHome()->getEntry('search')->hasEntries()): ?>
+if ($searchDashboard->search('dummy')->getActiveHome()->getEntry('search')->hasEntries()): ?>
     <form action="<?= $this->href('search') ?>" method="get" role="search" class="search-control">
         <input type="text" name="q" id="search" class="search search-input" required
                placeholder="<?= $this->translate('Search') ?> &hellip;"
diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
index 1fc097e43..5b12060ac 100644
--- a/library/Icinga/Web/Widget/SearchDashboard.php
+++ b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -6,6 +6,7 @@ namespace Icinga\Web\Widget;
 use Icinga\Exception\Http\HttpNotFoundException;
 use Icinga\Application\Icinga;
 use Icinga\Web\Dashboard\DashboardHome;
+use Icinga\Web\Dashboard\Dashlet;
 use Icinga\Web\Url;
 
 /**
@@ -104,11 +105,14 @@ class SearchDashboard extends \Icinga\Web\Dashboard\Dashboard
 
     protected function assemble()
     {
-        if ($this->searchHome->getEntry(self::SEARCH_PANE)->hasEntries()) {
+        if (! $this->searchHome->getEntry(self::SEARCH_PANE)->hasEntries()) {
             throw new HttpNotFoundException(t('Page not found'));
         }
 
-        $this->add($this->searchHome->getEntry(self::SEARCH_PANE)->getEntries());
+        /** @var Dashlet $dashlet */
+        foreach ($this->searchHome->getEntry(self::SEARCH_PANE)->getEntries() as $dashlet) {
+            $this->addHtml($dashlet->getHtml());
+        }
     }
 
     /**