ObjectController: directly use this->object

This commit is contained in:
Thomas Gelf 2015-08-02 15:15:52 +02:00
parent 22aa1552a4
commit 44154fe914
1 changed files with 2 additions and 3 deletions

View File

@ -65,7 +65,7 @@ abstract class ObjectController extends ActionController
{
$type = $this->getType();
$this->getTabs()->activate('render');
$this->view->object = $this->object();
$this->view->object = $this->object;
$this->render('object/show', null, true);
}
@ -171,11 +171,10 @@ abstract class ObjectController extends ActionController
{
$type = $this->getType();
$this->getTabs()->activate('history');
$object = $this->object();
$this->view->title = $this->translate('Activity Log');
$this->view->table = $this->applyPaginationLimits(
$this->loadTable('activityLog')->setConnection($this->db())
->filterObject('icinga_' . $type, $object->object_name)
->filterObject('icinga_' . $type, $this->object->object_name)
);
$this->render('object/history', null, true);
}