diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-06-09 13:13:37 +0300 |
|---|---|---|
| committer | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-06-09 13:16:21 +0300 |
| commit | bda1ce32fd4d5b6d0e63d2235a0b84600d5fa3d4 (patch) | |
| tree | 5cc14309c9b8e66ecbc4ddd71d5847b69feca913 /ui/app | |
| parent | 05824076acd274059cb23f0d5c80f385d21a86aa (diff) | |
..F....... [ZBX-18699] fixed selected value appearance in popup host group filter
Merge in ZBX/zabbix from feature/ZBX-18699-5.0 to release/5.0
* commit '07bca726cd6aacd8c670c690d4c4d500475826a6':
..F....... [ZBX-18699] fixed selection of hostgroup filter value in generic popup dialog
..F....... [ZBX-18699] fixed selected value appearance in popup host group filter
(cherry picked from commit 3bd8c19044b20d5131901ab409a076091d4946bd)
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/controllers/CControllerPopupGeneric.php | 4 |
1 files changed, 2 insertions, 2 deletions
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'] = [ |