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

IcingaObject: use resolved zone for apply/tpl

This commit is contained in:
Thomas Gelf 2016-05-10 20:23:45 +02:00
parent 3d1840d310
commit 576d62da26
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Director/Objects/IcingaObject.php
View File

@ -1134,9 +1134,9 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
public function getRenderingZone(IcingaConfig $config = null)
{
if ($this->zone_id) {
if ($zoneId = $this->getResolvedProperty('zone_id')) {
// Config has a lookup cache, is faster:
return $config->getZoneName($this->zone_id);
return $config->getZoneName($zoneId);
}
if ($this->isTemplate() || $this->isApplyRule()) {

6
library/Director/Web/Controller/ActionController.php
View File

@ -152,6 +152,12 @@ abstract class ActionController extends Controller
'label' => $this->translate('Sync rule'),
'url' => 'director/list/syncrule'
)
)->add(
'jobs',
array(
'label' => $this->translate('Jobs'),
'url' => 'director/jobs'
)
);
return $this->view->tabs;
}