tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use ! empty in favor of count > 0 in the MonitoredObjectController 

refs #8614
This commit is contained in:
Eric Lippmann 2015-03-11 14:08:43 +01:00
parent 2286ab1846
commit 361afdcf13
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
View File

@ -74,26 +74,26 @@ abstract class MonitoredObjectController extends Controller
} }
} }
$this->object->populate(); $this->object->populate();
if (count($this->object->comments) > 0 && $auth->hasPermission('monitoring/command/comment/delete')) {
$delCommentForm = new DeleteCommentCommandForm();
$delCommentForm
->setObjects($this->object)
->handleRequest();
$this->view->delCommentForm = $delCommentForm;
}
if (count($this->object->downtimes > 0) && $auth->hasPermission('monitoring/command/downtime/delete')) {
$delDowntimeForm = new DeleteDowntimeCommandForm();
$delDowntimeForm
->setObjects($this->object)
->handleRequest();
$this->view->delDowntimeForm = $delDowntimeForm;
}
$toggleFeaturesForm = new ToggleObjectFeaturesCommandForm(); $toggleFeaturesForm = new ToggleObjectFeaturesCommandForm();
$toggleFeaturesForm $toggleFeaturesForm
->load($this->object) ->load($this->object)
->setObjects($this->object) ->setObjects($this->object)
->handleRequest(); ->handleRequest();
$this->view->toggleFeaturesForm = $toggleFeaturesForm; $this->view->toggleFeaturesForm = $toggleFeaturesForm;
if (! empty($this->object->comments) && $auth->hasPermission('monitoring/command/comment/delete')) {
$delCommentForm = new DeleteCommentCommandForm();
$delCommentForm
->setObjects($this->object)
->handleRequest();
$this->view->delCommentForm = $delCommentForm;
}
if (! empty($this->object->downtimes) && $auth->hasPermission('monitoring/command/downtime/delete')) {
$delDowntimeForm = new DeleteDowntimeCommandForm();
$delDowntimeForm
->setObjects($this->object)
->handleRequest();
$this->view->delDowntimeForm = $delDowntimeForm;
}
$this->view->object = $this->object; $this->view->object = $this->object;
} }