Don't create search dashlets if the search string is empty

refs #8668
Icinga · Mar 12, 2015 · dc6b472 · dc6b472
1 parent 515fe32
commit dc6b472
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -60,6 +60,10 @@ protected function loadSearchDashlets($searchString)
         foreach ($manager->getLoadedModules() as $module) {
             $moduleSearchUrls = $module->getSearchUrls();
             if (! empty($moduleSearchUrls)) {
+                if ($searchString === '') {
+                    $pane->add(t('Ready to search'), 'search/hint');
+                    return;
+                }
                 $searchUrls = array_merge($searchUrls, $moduleSearchUrls);
             }
         }
@@ -72,12 +76,6 @@ protected function loadSearchDashlets($searchString)
                 Url::fromPath($searchUrl->url, array('q' => $searchString))
             );
         }
-
-        if ($searchString === '' && $pane->hasDashlets()) {
-            $pane->removeDashlets();
-            $pane->add('Ready to search', 'search/hint');
-            return;
-        }
     }
 
     /**