diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-02-22 01:01:00 +0300 |
|---|---|---|
| committer | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-02-22 01:01:00 +0300 |
| commit | 0ed3323538d2e09fc4d0302bf827543312e5e4ea (patch) | |
| tree | 8421d4a0330a3e06a5a2f0d19b2f47cddfa51071 /ui/items.php | |
| parent | 979c593d925b5629af1e981b082e2fd39ab7e188 (diff) | |
..F....... [ZBXNEXT-2976] fixed item configuration list tags filter
Diffstat (limited to 'ui/items.php')
| -rw-r--r-- | ui/items.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/items.php b/ui/items.php index dfc366a95a6..4069631d1cc 100644 --- a/ui/items.php +++ b/ui/items.php @@ -379,7 +379,7 @@ if (hasRequest('filter_set')) { $filter_tags['values'][] = $tag['value']; $filter_tags['operators'][] = $tag['operator']; } - CProfile::update($prefix.'items.filter.evaltype', getRequest('evaltype', TAG_EVAL_TYPE_AND_OR), PROFILE_TYPE_INT); + CProfile::update($prefix.'items.filter.evaltype', getRequest('filter_evaltype', TAG_EVAL_TYPE_AND_OR), PROFILE_TYPE_INT); CProfile::updateArray($prefix.'items.filter.tags.tag', $filter_tags['tags'], PROFILE_TYPE_STR); CProfile::updateArray($prefix.'items.filter.tags.value', $filter_tags['values'], PROFILE_TYPE_STR); CProfile::updateArray($prefix.'items.filter.tags.operator', $filter_tags['operators'], PROFILE_TYPE_INT); @@ -1616,6 +1616,9 @@ else { 'subfilter_discovered' => getRequest('subfilter_discovered') ]; } + + $data['subfilter'] = makeItemSubfilter($data['filter_data'], $data['items'], $data['context']); + if (!$data['filter_data']['filter_tags']) { $data['filter_data']['filter_tags'] = [[ 'tag' => '', @@ -1624,8 +1627,6 @@ else { ]]; } - $data['subfilter'] = makeItemSubfilter($data['filter_data'], $data['items'], $data['context']); - // Replace hash keys by numeric index used in subfilter. foreach ($data['filter_data']['subfilter_tags'] as $hash => $tag) { $data['filter_data']['subfilter_tags'][$tag['num']] = [ |