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

Don't fetch comments and downtimes twice in an object's detail view 

The controller counts comments and downtimes on the object, which will automatically fetch comments and downtimes.
After that came a call to MonitoredObject::populate() which again fetched comments and downtimes.
Now the object is populated before counting comments and dowtimes.

refs #8614
This commit is contained in:
Eric Lippmann 2015-03-11 13:32:54 +01:00
parent b501fef62b
commit 0286641369
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,6 +73,7 @@ abstract class MonitoredObjectController extends Controller
} }
} }
} }
$this->object->populate();
if (count($this->object->comments) > 0 && $auth->hasPermission('monitoring/command/comment/delete')) { if (count($this->object->comments) > 0 && $auth->hasPermission('monitoring/command/comment/delete')) {
$delCommentForm = new DeleteCommentCommandForm(); $delCommentForm = new DeleteCommentCommandForm();
$delCommentForm $delCommentForm
@ -93,7 +94,7 @@ abstract class MonitoredObjectController extends Controller
->setObjects($this->object) ->setObjects($this->object)
->handleRequest(); ->handleRequest();
$this->view->toggleFeaturesForm = $toggleFeaturesForm; $this->view->toggleFeaturesForm = $toggleFeaturesForm;
$this->view->object = $this->object->populate(); $this->view->object = $this->object;
} }
/** /**