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

Display apply_for in apply listings

Browse Source
This commit is contained in:
Markus Frosch 2019-05-06 14:38:17 +02:00
parent 83245f2dd4
commit 767296ce6a
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/Director/Web/Table/ApplyRulesTable.php
View File

@ -79,9 +79,15 @@ class ApplyRulesTable extends ZfQueryBasedTable
} }
$url = Url::fromPath("director/{$this->baseObjectUrl}/edit", $params); $url = Url::fromPath("director/{$this->baseObjectUrl}/edit", $params);
$assignWhere = $this->renderApplyFilter($row->assign_filter);
if (! empty($row->apply_for)) {
$assignWhere = sprintf('apply for %s / %s', $row->apply_for, $assignWhere);
}
$tr = static::tr([ $tr = static::tr([
static::td(Link::create($row->object_name, $url)), static::td(Link::create($row->object_name, $url)),
static::td($this->renderApplyFilter($row->assign_filter)), static::td($assignWhere),
// NOT (YET) static::td($this->createActionLinks($row))->setSeparator(' ') // NOT (YET) static::td($this->createActionLinks($row))->setSeparator(' ')
]); ]);
@ -203,6 +209,7 @@ class ApplyRulesTable extends ZfQueryBasedTable
'object_name' => 'o.object_name', 'object_name' => 'o.object_name',
'disabled' => 'o.disabled', 'disabled' => 'o.disabled',
'assign_filter' => 'o.assign_filter', 'assign_filter' => 'o.assign_filter',
'apply_for' => 'o.apply_for',
]; ];
$query = $this->db()->select()->from( $query = $this->db()->select()->from(
['o' => $table], ['o' => $table],

10
library/Director/Web/Table/IcingaHostAppliedServicesTable.php
View File

@ -98,9 +98,15 @@ class IcingaHostAppliedServicesTable extends SimpleQueryBasedTable
$link = Html::tag('a', $row->name); $link = Html::tag('a', $row->name);
} }
} else { } else {
$applyFor = '';
if (! empty($row->apply_for)) {
$applyFor = sprintf('(apply for %s) ', $row->apply_for);
}
$link = Link::create(sprintf( $link = Link::create(sprintf(
$this->translate('%s (%s)'), $this->translate('%s %s(%s)'),
$row->name, $row->name,
$applyFor,
$this->renderApplyFilter($row->filter) $this->renderApplyFilter($row->filter)
), 'director/host/appliedservice', [ ), 'director/host/appliedservice', [
'name' => $this->host->getObjectName(), 'name' => $this->host->getObjectName(),
@ -148,6 +154,7 @@ class IcingaHostAppliedServicesTable extends SimpleQueryBasedTable
'disabled' => 'disabled', 'disabled' => 'disabled',
'blacklisted' => 'blacklisted', 'blacklisted' => 'blacklisted',
'assign_filter' => 'assign_filter', 'assign_filter' => 'assign_filter',
'apply_for' => 'apply_for',
]); ]);
} }
@ -178,6 +185,7 @@ class IcingaHostAppliedServicesTable extends SimpleQueryBasedTable
'id' => 's.id', 'id' => 's.id',
'name' => 's.object_name', 'name' => 's.object_name',
'assign_filter' => 's.assign_filter', 'assign_filter' => 's.assign_filter',
'apply_for' => 's.apply_for',
'disabled' => 's.disabled', 'disabled' => 's.disabled',
'blacklisted' => "CASE WHEN hsb.service_id IS NULL THEN 'n' ELSE 'y' END", 'blacklisted' => "CASE WHEN hsb.service_id IS NULL THEN 'n' ELSE 'y' END",
] ]