Commands: show external commands separately

application/controllers/CommandsController.php

@@ -6,4 +6,15 @@ use Icinga\Module\Director\Web\Controller\ObjectsController;
 
 class CommandsController extends ObjectsController
 {
+    public function indexAction()
+    {
+        parent::indexAction();
+        $validTypes = ['object', 'external_object'];
+        $type = $this->params->get('type', 'object');
+        if (! in_array($type, $validTypes)) {
+            $type = 'object';
+        }
+
+        $this->table->setType($type);
+    }
 }

library/Director/Dashboard/CommandsDashboard.php

@@ -6,10 +6,10 @@ class CommandsDashboard extends Dashboard
 {
     protected $dashletNames = array(
         'CheckCommands',
-        // 'ExternalCheckCommands',
+        'ExternalCheckCommands',
         // 'NotificationCommands',
         // 'ExternalNotificationCommands',
-        // 'CommandTemplates',
+        'CommandTemplates',
     );
 
     public function getTitle()

library/Director/Dashboard/Dashlet/CommandTemplatesDashlet.php

@@ -16,6 +16,11 @@ class CommandTemplatesDashlet extends CheckCommandsDashlet
 
     public function getTitle()
     {
-        return $this->translate('External Notification Commands');
+        return $this->translate('Command Templates');
+    }
+
+    public function getUrl()
+    {
+        return 'director/commands/templates';
     }
 }

library/Director/Dashboard/Dashlet/ExternalCheckCommandsDashlet.php

@@ -9,13 +9,18 @@ class ExternalCheckCommandsDashlet extends CheckCommandsDashlet
     public function getSummary()
     {
         return $this->translate(
-            'External Check Commands have been defined in your local Icinga 2'
-            . ' Configuration. '
+            'External Commands have been defined in your local Icinga 2'
+            . ' Configuration.'
         );
     }
 
     public function getTitle()
     {
-        return $this->translate('External Check Commands');
+        return $this->translate('External Commands');
+    }
+
+    public function getUrl()
+    {
+        return 'director/commands?type=external_object';
     }
 }

library/Director/Web/Table/ObjectsTableCommand.php

@@ -2,6 +2,8 @@
 
 namespace Icinga\Module\Director\Web\Table;
 
+use Zend_Db_Select as ZfSelect;
+
 class ObjectsTableCommand extends ObjectsTable
 {
     // TODO: external commands? Notifications separately?
@@ -21,4 +23,17 @@ class ObjectsTableCommand extends ObjectsTable
         'object_name' => 'Command',
         'command'     => 'Command line'
     ];
+
+    private $objectType;
+
+    public function setType($type)
+    {
+        $this->getQuery()->where('object_type = ?', $type);
+        return $this;
+    }
+
+    protected function applyObjectTypeFilter(ZfSelect $query)
+    {
+        return $query;
+    }
 }