WIP

Author: yhabteab

application/controllers/DowntimesController.php

@@ -43,7 +43,7 @@ public function indexAction()
         $sortControl = $this->createSortControl(
             $downtimes,
             [
-                'downtime.is_in_effect, downtime.start_time'      => t('Is In Effect'),
+                'downtime.is_in_effect desc, downtime.start_time desc' => t('Is In Effect'),
                 'downtime.entry_time'                             => t('Entry Time'),
                 'host.display_name, service.display_name'         => t('Host'),
                 'service.display_name, host.display_name'         => t('Service'),

application/controllers/HistoryController.php

@@ -81,10 +81,6 @@ public function indexAction()
         }
 
         $this->filter($history, $filter);
-        $history->getWith()['history.host']->setJoinType('LEFT');
-        $history->getSelectBase()
-            // Make sure we'll fetch service history entries only for services which still exist
-            ->where(['history.service_id IS NULL', 'history_service.id IS NOT NULL'], Sql::ANY);
 
         yield $this->export($history);
 

application/controllers/ServiceController.php

@@ -126,10 +126,7 @@ public function historyAction()
 
         $history
             ->getSelectBase()
-            ->where([
-                'history.host_id = ?'    => $this->service->host->id,
-                'history.service_id = ?' => $this->service->id
-            ]);
+            ->where(['history.service_id = ?' => $this->service->id]);
 
         $before = $this->params->shift('before', time());
         $url = Url::fromRequest()->setParams(clone $this->params);

library/Icingadb/Model/Downtime.php

@@ -87,7 +87,7 @@ public function getSearchColumns()
 
     public function getDefaultSort()
     {
-        return ['downtime.is_in_effect', 'downtime.start_time'];
+        return ['downtime.is_in_effect desc', 'downtime.start_time desc'];
     }
 
     public function createBehaviors(Behaviors $behaviors)

library/Icingadb/Model/Host.php

@@ -197,7 +197,7 @@ public function createRelations(Relations $relations)
         $relations->belongsToMany('hostgroup', Hostgroup::class)
             ->through(HostgroupMember::class);
 
-        $relations->hasOne('state', HostState::class)->setJoinType('LEFT');
+        $relations->hasOne('state', HostState::class);
         $relations->hasMany('comment', Comment::class)->setJoinType('LEFT');
         $relations->hasMany('downtime', Downtime::class)->setJoinType('LEFT');
         $relations->hasMany('history', History::class);

library/Icingadb/Model/Service.php

@@ -190,7 +190,7 @@ public function createRelations(Relations $relations)
         $relations->belongsToMany('hostgroup', Hostgroup::class)
             ->through(HostgroupMember::class);
 
-        $relations->hasOne('state', ServiceState::class)->setJoinType('LEFT');
+        $relations->hasOne('state', ServiceState::class);
         $relations->hasMany('comment', Comment::class)->setJoinType('LEFT');
         $relations->hasMany('downtime', Downtime::class)->setJoinType('LEFT');
         $relations->hasMany('history', History::class);