From 767296ce6afe27ba7fcefbe1b3b20172f6bc41b0 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Mon, 6 May 2019 14:38:17 +0200
Subject: [PATCH] Display apply_for in apply listings

---
 library/Director/Web/Table/ApplyRulesTable.php         |  9 ++++++++-
 .../Web/Table/IcingaHostAppliedServicesTable.php       | 10 +++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/library/Director/Web/Table/ApplyRulesTable.php b/library/Director/Web/Table/ApplyRulesTable.php
index 18131847..e153123e 100644
--- a/library/Director/Web/Table/ApplyRulesTable.php
+++ b/library/Director/Web/Table/ApplyRulesTable.php
@@ -79,9 +79,15 @@ class ApplyRulesTable extends ZfQueryBasedTable
         }
         $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([
             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(' ')
         ]);
 
@@ -203,6 +209,7 @@ class ApplyRulesTable extends ZfQueryBasedTable
             'object_name'   => 'o.object_name',
             'disabled'      => 'o.disabled',
             'assign_filter' => 'o.assign_filter',
+            'apply_for'     => 'o.apply_for',
         ];
         $query = $this->db()->select()->from(
             ['o' => $table],
diff --git a/library/Director/Web/Table/IcingaHostAppliedServicesTable.php b/library/Director/Web/Table/IcingaHostAppliedServicesTable.php
index b9d8fa36..95635be4 100644
--- a/library/Director/Web/Table/IcingaHostAppliedServicesTable.php
+++ b/library/Director/Web/Table/IcingaHostAppliedServicesTable.php
@@ -98,9 +98,15 @@ class IcingaHostAppliedServicesTable extends SimpleQueryBasedTable
                 $link = Html::tag('a', $row->name);
             }
         } else {
+            $applyFor = '';
+            if (! empty($row->apply_for)) {
+                $applyFor = sprintf('(apply for %s) ', $row->apply_for);
+            }
+
             $link = Link::create(sprintf(
-                $this->translate('%s (%s)'),
+                $this->translate('%s %s(%s)'),
                 $row->name,
+                $applyFor,
                 $this->renderApplyFilter($row->filter)
             ), 'director/host/appliedservice', [
                 'name'       => $this->host->getObjectName(),
@@ -148,6 +154,7 @@ class IcingaHostAppliedServicesTable extends SimpleQueryBasedTable
             'disabled'      => 'disabled',
             'blacklisted'   => 'blacklisted',
             'assign_filter' => 'assign_filter',
+            'apply_for'     => 'apply_for',
         ]);
     }
 
@@ -178,6 +185,7 @@ class IcingaHostAppliedServicesTable extends SimpleQueryBasedTable
                 'id'            => 's.id',
                 'name'          => 's.object_name',
                 'assign_filter' => 's.assign_filter',
+                'apply_for'     => 's.apply_for',
                 'disabled'      => 's.disabled',
                 'blacklisted'   => "CASE WHEN hsb.service_id IS NULL THEN 'n' ELSE 'y' END",
             ]