tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-24 22:34:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

ObjectController: improve object loading

Browse Source
This commit is contained in:
Thomas Gelf 2016-03-06 14:20:49 +01:00
parent fb43331379
commit e5429ab1f3
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
library/Director/Web/Controller/ObjectController.php
View File

@ -4,6 +4,7 @@ namespace Icinga\Module\Director\Web\Controller;
use Exception;
use Icinga\Exception\IcingaException;
use Icinga\Exception\InvalidPropertyException;
use Icinga\Exception\NotFoundError;
use Icinga\Module\Director\Objects\IcingaObject;
use Icinga\Web\Url;
@ -20,10 +21,9 @@ abstract class ObjectController extends ActionController
$type = $this->getType();
$params = array();
if ($object = $this->loadObject()) {
$params['name'] = $object->object_name;
$params = $object->getUrlParams();
$tabs = $this->getTabs()->add('modify', array(
'url' => sprintf('director/%s', $type),
@ -254,12 +254,24 @@ abstract class ObjectController extends ActionController
protected function loadObject()
{
if ($this->object === null && $name = $this->params->get('name')) {
$this->object = IcingaObject::loadByType(
$this->getType(),
$name,
$this->db()
);
if ($this->object === null) {
if ($name = $this->params->get('name')) {
$this->object = IcingaObject::loadByType(
$this->getType(),
$name,
$this->db()
);
} elseif ($id = $this->params->get('id')) {
$this->object = IcingaObject::loadByType(
$this->getType(),
(int) $id,
$this->db()
);
} else {
throw new InvalidPropertyException(
'Cannot load object, missing parameters'
);
}
$this->view->undeployedChanges = $this->countUndeployedChanges();
$this->view->totalUndeployedChanges = $this->db()