IcingaServiceTable: Update apply rule rendering

For new storage format, and change to table.

refs #12033

application/tables/IcingaServiceTable.php

@@ -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
@@ -55,13 +58,26 @@ class IcingaServiceTable extends QuickTable
             }
 
         } 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();
                 }
-            $htm .= '</ul>';
+                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 .= '</table>';
             $htm .= $v->qlink(
                 'Add more',
                 'director/service/add',
@@ -110,7 +126,8 @@ class IcingaServiceTable extends QuickTable
             array('s' => 'icinga_service'),
             array(
                 'id'          => 's.id',
-                'objectname' => $nameCol,
+                'object_name' => 's.object_name',
+                'assign_filter' => 's.assign_filter',
             )
         )->join(
             array('i' => 'icinga_service_inheritance'),
@@ -119,13 +136,7 @@ class IcingaServiceTable extends QuickTable
         )->where('i.parent_service_id = ?', $id)
         ->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()

public/css/module.less

@@ -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;
             }
         }
     }