From 40544ac9354f29cdc764aa1e05ba2cefa7a7920f Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Fri, 28 May 2021 10:48:29 +0200 Subject: [PATCH] ObjectPreview: fix inline Service Template links... ...for Service Sets fixes #2334 --- doc/82-Changelog.md | 1 + library/Director/Web/ObjectPreview.php | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md index 79468999..97fd2133 100644 --- a/doc/82-Changelog.md +++ b/doc/82-Changelog.md @@ -27,6 +27,7 @@ next (will be 1.9.0) * FIX: show Override button when all Fields belong to Field Categories (#2303) * FIX: show Services applied with Rules involving applied Hostgroups (#2313) * FIX: Overrides for Services belonging to Sets on root Host Templates (#2333) +* FIX: Service Set preview inline Service Template links (#2334) * FEATURE: show "deprecated" flag on object attribute inspection (#2312) * FEATURE: Service Template for single Host services provides auto-completion (#1974) diff --git a/library/Director/Web/ObjectPreview.php b/library/Director/Web/ObjectPreview.php index b85dfca5..e7648e19 100644 --- a/library/Director/Web/ObjectPreview.php +++ b/library/Director/Web/ObjectPreview.php @@ -141,9 +141,13 @@ class ObjectPreview return $match[1] . $match[2] . $match[3]; } + $urlObjectType = $this->object->getShortTableName(); + if ($urlObjectType === 'service_set') { + $urlObjectType = 'service'; + } return $match[1] . Link::create( $match[2], - sprintf('director/' . $this->object->getShortTableName()), + sprintf("director/$urlObjectType"), ['name' => $match[2]] )->render() . $match[3]; }