SearchDashboard: rename ::load() to ::search()

Function signature didn't match parent factory function fixes #7081
Icinga · Sep 4, 2014 · 0f7f2f2 · 0f7f2f2
1 parent 0f8d5bd
commit 0f7f2f2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/application/controllers/SearchController.php b/application/controllers/SearchController.php
@@ -13,7 +13,7 @@ class SearchController extends ActionController
 {
     public function indexAction()
     {
-        $this->view->dashboard = SearchDashboard::load($this->params->get('q'));
+        $this->view->dashboard = SearchDashboard::search($this->params->get('q'));
 
         // NOTE: This renders the dashboard twice. Remove this once we can catch exceptions thrown in view scripts.
         $this->view->dashboard->render();

diff --git a/application/layouts/scripts/parts/navigation.phtml b/application/layouts/scripts/parts/navigation.phtml
@@ -12,7 +12,7 @@ if (! $this->auth()->isAuthenticated()) {
 
 ?>
 <div id="menu" data-base-target="_main">
-  <? if (SearchDashboard::load('dummy')->getPane('search')->hasComponents()): ?>
+  <? if (SearchDashboard::search('dummy')->getPane('search')->hasComponents()): ?>
   <form action="<?= $this->href('search') ?>" method="get" role="search">
     <input type="text" name="q" class="search autofocus" placeholder="<?= $this->translate('Search...') ?>" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
   </form>

diff --git a/library/Icinga/Web/Widget/SearchDashboard.php b/library/Icinga/Web/Widget/SearchDashboard.php
@@ -32,7 +32,7 @@ class SearchDashboard extends Dashboard
      * @param $searchQuery
      * @return Dashboard|SearchDashboard
      */
-    public static function load($searchQuery = '')
+    public static function search($searchQuery = '')
     {
         /** @var $dashboard SearchDashboard */
         $dashboard = new static('searchDashboard');

diff --git a/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php b/test/php/library/Icinga/Web/Widget/SearchDashboardTest.php
@@ -48,27 +48,27 @@ function () use ($request) { return $request; }
      */
     public function testFoo()
     {
-        $dashboard = SearchDashboard::load('pending');
+        $dashboard = SearchDashboard::search('pending');
         $dashboard->getPane('search')->removeComponents();
         $dashboard->render();
     }
 
     public function testWhetherLoadLoadsSearchDashletsFromModules()
     {
-        $dashboard = SearchDashboard::load('pending');
+        $dashboard = SearchDashboard::search('pending');
 
         $result = $dashboard->getPane('search')->hasComponent('Hosts: pending');
 
-        $this->assertTrue($result, 'Dashboard::load() could not load search dashlets from modules');
+        $this->assertTrue($result, 'Dashboard::search() could not load search dashlets from modules');
     }
 
 
     public function testWhetherLoadProvidesHint()
     {
-        $dashboard = SearchDashboard::load('');
+        $dashboard = SearchDashboard::search('');
 
         $result = $dashboard->getPane('search')->hasComponent('Ready to search');
 
-        $this->assertTrue($result, 'Dashboard::load() could not get hint for search');
+        $this->assertTrue($result, 'Dashboard::search() could not get hint for search');
     }
 }