Move setupSortControl() from Monitoring_ListController to Icinga\Web\…

…Controller
Icinga · Apr 10, 2015 · a817d90 · a817d90
1 parent 20b09d3
commit a817d90
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
@@ -4,6 +4,7 @@
 namespace Icinga\Web;
 
 use Icinga\Web\Controller\ModuleActionController;
+use Icinga\Web\Widget\SortBox;
 
 /**
  * This is the controller all modules should inherit from
@@ -12,4 +13,18 @@
  */
 class Controller extends ModuleActionController
 {
+    /**
+     * Create a sort control box at the 'sortControl' view parameter
+     *
+     * @param array $columns    An array containing the sort columns, with the
+     *                          submit value as the key and the label as the value
+     */
+    protected function setupSortControl(array $columns)
+    {
+        $req = $this->getRequest();
+        $this->view->sortControl = SortBox::create(
+            'sortbox-' . $req->getActionName(),
+            $columns
+        )->applyRequest($req);
+    }
 }
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
@@ -9,7 +9,6 @@
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Web\Widget\Tabs;
-use Icinga\Web\Widget\SortBox;
 use Icinga\Data\Filter\Filter;
 use Icinga\Web\Widget;
 use Icinga\Module\Monitoring\Forms\StatehistoryForm;
@@ -694,21 +693,6 @@ protected function extraColumns()
         return $columns;
     }
 
-    /**
-     * Create a sort control box at the 'sortControl' view parameter
-     *
-     * @param array $columns    An array containing the sort columns, with the
-     *                          submit value as the key and the value as the label
-     */
-    private function setupSortControl(array $columns)
-    {
-        $this->view->sortControl = new SortBox(
-            'sortbox-' . $this->getRequest()->getActionName(),
-            $columns
-        );
-        $this->view->sortControl->applyRequest($this->getRequest());
-    }
-
     protected function addTitleTab($action, $title, $tip)
     {
         $this->getTabs()->add($action, array(