From 83617b22e874fb5a70379bcfe261ac76649e039c Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 5 Oct 2021 23:14:49 +0200
Subject: [PATCH] HostController: services on new branch host, hint

---
 application/controllers/HostController.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php
index 2738a0c6..f2034383 100644
--- a/application/controllers/HostController.php
+++ b/application/controllers/HostController.php
@@ -107,6 +107,7 @@ class HostController extends ObjectController
         $this->addTitle($this->translate('Add Service to %s'), $host->getObjectName());
         $this->content()->add(
             IcingaAddServiceForm::load()
+                ->setBranch($this->getBranch())
                 ->setHost($host)
                 ->setDb($this->db())
                 ->handleRequest()
@@ -199,12 +200,21 @@ class HostController extends ObjectController
     public function servicesAction()
     {
         $this->addServicesHeader();
-        $db = $this->db();
         $host = $this->getHostObject();
         $this->addTitle($this->translate('Services: %s'), $host->getObjectName());
+        $branch = $this->getBranch();
+        if ($branch->isBranch() && $host->get('id') === null) {
+            $this->content()->add(Hint::info(
+                $this->translate('Managing services on new Hosts is possible only after they have been merged.')
+            ));
+            return;
+        }
         $content = $this->content();
         $table = IcingaHostServiceTable::load($host)
             ->setTitle($this->translate('Individual Service objects'));
+        if ($branch->isBranch()) {
+            $table->setBranchUuid($branch->getUuid());
+        }
 
         if (count($table)) {
             $content->add($table);
@@ -598,7 +608,7 @@ class HostController extends ObjectController
      */
     protected function getHostObject()
     {
-        /** @var IcingaHost $this->object */
+        assert($this->object instanceof IcingaHost);
         return $this->object;
     }
 }