Fix indistinguishable suggestions for nodes (#433)

refs #427
Icinga · Apr 23, 2024 · e9a551e · e9a551e
1 parent 3a0b40a
commit e9a551e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/application/controllers/SuggestionsController.php b/application/controllers/SuggestionsController.php
@@ -101,7 +101,7 @@ public function processAction()
                     ) {
                         yield [
                             'search' => $search,
-                            'label'  => $bpNode->getAlias() ?? $bpNode->getName(),
+                            'label'  => $bpNode->getLabel(),
                             'config' => $config
                         ];
                     }

diff --git a/application/forms/AddNodeForm.php b/application/forms/AddNodeForm.php
@@ -236,7 +236,7 @@ protected function assembleExistingProcessElements(): void
                                 if (! $bp->hasNode($nodeName)) {
                                     $term->setMessage($this->translate('No node with this name found in config'));
                                 } else {
-                                    $term->setLabel($bp->getNode($nodeName)->getAlias());
+                                    $term->setLabel($bp->getNode($nodeName)->getLabel());
                                 }
                             }
                         }

diff --git a/library/Businessprocess/Node.php b/library/Businessprocess/Node.php
@@ -367,6 +367,17 @@ public function setAlias($alias)
         return $this;
     }
 
+    /**
+     * Get the label of the node
+     *
+     * @return ?string
+     */
+    public function getLabel()
+    {
+        return ($this->alias ?? $this->name)
+            . ' (' . implode(' » ', $this->getPaths()[0]) . ')';
+    }
+
     public function hasParents()
     {
         return count($this->parents) > 0;