..F....... [ZBXNEXT-6411] fixed TOC name selection for templates and host prototypes

1 files changed, 12 insertions, 1 deletions

diff --git a/ui/app/controllers/CControllerPopupImportCompare.php b/ui/app/controllers/CControllerPopupImportCompare.php
index e136f09a72c..5eebb73bb6d 100644
--- a/ui/app/controllers/CControllerPopupImportCompare.php
+++ b/ui/app/controllers/CControllerPopupImportCompare.php
@@ -444,7 +444,7 @@ class CControllerPopupImportCompare extends CController {
 
 					$id = $object['uuid'];
 					$this->toc[$change_type][$entity_type][] = [
-						'name' => $object['name'],
+						'name' => $this->nameForToc($entity_type, $object),
 						'id' => $id
 					];
 
@@ -460,6 +460,17 @@ class CControllerPopupImportCompare extends CController {
 		return $rows;
 	}
 
+	private function nameForToc(string $entity_type, array $object): string {
+		switch ($entity_type) {
+			case 'templates':
+				return array_key_exists('name', $object) ? $object['name'] : $object['template'];
+			case 'host_prototypes':
+				return array_key_exists('name', $object) ? $object['name'] : $object['host'];
+			default:
+				return $object['name'];
+		}
+	}
+
 	private function convertToYaml($object): string {
 		$writer = new CYamlExportWriter();