diff options
-rw-r--r-- | ChangeLog.d/bugfix/ZBX-18699 | 1 | ||||
-rw-r--r-- | ui/app/controllers/CControllerPopupGeneric.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-18699 b/ChangeLog.d/bugfix/ZBX-18699 new file mode 100644 index 00000000000..cdcc32a41f6 --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-18699 @@ -0,0 +1 @@ +..F....... [ZBX-18699] fixed selected value appearance in popup host group filter (miks) diff --git a/ui/app/controllers/CControllerPopupGeneric.php b/ui/app/controllers/CControllerPopupGeneric.php index 619223b5025..a8cb01cd435 100644 --- a/ui/app/controllers/CControllerPopupGeneric.php +++ b/ui/app/controllers/CControllerPopupGeneric.php @@ -616,7 +616,7 @@ class CControllerPopupGeneric extends CController { $host_options['templated_hosts'] = 1; $group_options['templated_hosts'] = 1; } - elseif ($this->source_table !== 'templates') { + elseif ($this->source_table !== 'templates' && $this->source_table !== 'host_templates') { $group_options['with_hosts_and_templates'] = 1; } @@ -645,7 +645,7 @@ class CControllerPopupGeneric extends CController { ? API::HostGroup()->get([ 'output' => ['name', 'groupid'], 'groupids' => $this->groupids - ] + $group_options) + ]) : []; $filter['groups'] = [ |