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

IcingaServiceTable: Update apply rule rendering 

For new storage format, and change to table.

refs #12033
This commit is contained in:
Markus Frosch 2016-10-24 14:43:38 +02:00
parent 0d86c24cd8
commit b3eb5ea102
2 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
application/tables/IcingaServiceTable.php
View File

@ -2,6 +2,9 @@
namespace Icinga\Module\Director\Tables;
use Icinga\Data\Filter\Filter;
use Icinga\Exception\IcingaException;
use Icinga\Module\Director\IcingaConfig\AssignRenderer;
use Icinga\Module\Director\Web\Table\QuickTable;
class IcingaServiceTable extends QuickTable
@ -13,9 +16,9 @@ class IcingaServiceTable extends QuickTable
public function getColumns()
{
return array(
'id' => 's.id',
'service' => 's.object_name',
'object_type' => 's.object_type',
'id' => 's.id',
'service' => 's.object_name',
'object_type' => 's.object_type',
'check_command_id' => 's.check_command_id',
);
}
@ -47,21 +50,34 @@ class IcingaServiceTable extends QuickTable
if (empty($extra)) {
if ($row->check_command_id) {
$htm .= ' ' . $v->qlink(
'Create apply-rule',
'director/service/add',
array('apply' => $row->service),
array('class' => 'icon-plus')
);
'Create apply-rule',
'director/service/add',
array('apply' => $row->service),
array('class' => 'icon-plus')
);
}
} else {
$htm .= '. Related apply rules: <ul class="apply-rules">';
foreach ($extra as $id => $service) {
$htm .= '<li>'
. $v->qlink($service, 'director/service', array('id' => $id))
. '</li>';
$htm .= '. Related apply rules: <table class="apply-rules">';
foreach ($extra as $service) {
$href = $v->url('director/service', array('id' => $service->id));
$htm .= "<tr href=\"$href\">";
try {
$prettyFilter = AssignRenderer::forFilter(
Filter::fromQueryString($service->assign_filter)
)->renderAssign();
}
catch (IcingaException $e) {
// ignore errors in filter rendering
$prettyFilter = 'Error in Filter rendering: ' . $e->getMessage();
}
$htm .= "<td><a href=\"$href\">" . $service->object_name . '</a></td>';
$htm .= '<td>' . $prettyFilter . '</td>';
$htm .= '<tr>';
}
$htm .= '</ul>';
$htm .= '</table>';
$htm .= $v->qlink(
'Add more',
'director/service/add',
@ -109,23 +125,18 @@ class IcingaServiceTable extends QuickTable
$query = $db->select()->from(
array('s' => 'icinga_service'),
array(
'id' => 's.id',
'objectname' => $nameCol,
'id' => 's.id',
'object_name' => 's.object_name',
'assign_filter' => 's.assign_filter',
)
)->join(
array('i' => 'icinga_service_inheritance'),
'i.service_id = s.id',
array()
)->where('i.parent_service_id = ?', $id)
->where('s.object_type = ?', 'apply');
->where('s.object_type = ?', 'apply');
$query->joinLeft(
array('a' => 'icinga_service_assignment'),
'a.service_id = s.id',
array()
)->group('s.id');
return $db->fetchPairs($query);
return $db->fetchAll($query);
}
public function getBaseQuery()
@ -134,6 +145,6 @@ class IcingaServiceTable extends QuickTable
's.object_type IN (?)',
array('template')
)->order('CASE WHEN s.check_command_id IS NULL THEN 1 ELSE 0 END')
->order('s.object_name');
->order('s.object_name');
}
}

30
public/css/module.less
View File

@ -887,25 +887,25 @@ table.icinga-objects {
}
table.assignment-table {
ul.apply-rules {
table.apply-rules {
margin: 1em 0 1em 0;
padding: 0;
border: 1px solid @gray-lighter;
width: 100%;
li {
display: block;
tr {
border-bottom: 1px solid @gray-lighter;
border-left: 5px solid transparent;
a {
display: block;
float: none;
font-weight: normal;
background-color: white;
padding: 0.3em 1.5em;
&:hover {
background-color: @icinga-blue;
color: white;
text-decoration: none;
}
td {
padding: 0.5em 1em;
}
&:hover, &:active, &.active {
border-left: 5px solid @icinga-blue;
}
&:hover {
background: white;
}
}
}