.......... [ZBX-20638] updated to latest master

6 files changed, 22 insertions, 13 deletions

diff --git a/ui/app/partials/configuration.filter.items.php b/ui/app/partials/configuration.filter.items.php
index f3ce4cbd54c..848abcece3e 100644
--- a/ui/app/partials/configuration.filter.items.php
+++ b/ui/app/partials/configuration.filter.items.php
@@ -52,7 +52,7 @@ zbx_add_post_js("var filterTypeSwitcher".
 
 // First column.
 $filter_column_1
-	->addRow((new CLabel(_('Host groups'), 'filter_groupid_ms')),
+	->addRow((new CLabel(_('Host groups'), 'filter_groupids__ms')),
 		(new CMultiSelect([
 			'name' => 'filter_groupids[]',
 			'object_name' => 'hostGroup',
@@ -69,7 +69,7 @@ $filter_column_1
 			]
 		]))->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH)
 	)
-	->addRow((new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hostid_ms')),
+	->addRow((new CLabel(($data['context'] === 'host') ? _('Hosts') : _('Templates'), 'filter_hostids__ms')),
 		(new CMultiSelect([
 			'name' => 'filter_hostids[]',
 			'object_name' => ($data['context'] === 'host') ? 'hosts' : 'templates',
@@ -96,7 +96,7 @@ $filter_column_1
 	);
 
 if ($data['filter_data']['hosts']) {
-	$filter_column_1->addRow(_('Value mapping'),
+	$filter_column_1->addRow(new CLabel(_('Value mapping'), 'filter_valuemapids__ms'),
 		(new CMultiSelect([
 			'name' => 'filter_valuemapids[]',
 			'object_name' => 'valuemap_names',
diff --git a/ui/app/partials/configuration.host.edit.html.php b/ui/app/partials/configuration.host.edit.html.php
index e5b4c511ce6..a1a2f97df3d 100644
--- a/ui/app/partials/configuration.host.edit.html.php
+++ b/ui/app/partials/configuration.host.edit.html.php
@@ -207,7 +207,17 @@ else {
 
 $host_tab
 	->addItem([
-		new CLabel(_('Templates')),
+		new CLabel([
+			_('Templates'),
+			$host_is_discovered
+				? makeHelpIcon([
+				(new CList([
+					_('Templates linked by host discovery cannot be unlinked.'),
+					_('Use host prototype configuration form to remove automatically linked templates on upcoming discovery.')
+				]))
+			])
+				: null
+		], 'add_templates__ms'),
 		(new CFormField(
 			(count($templates_field_items) > 1)
 				? (new CDiv($templates_field_items))->addClass('linked-templates')
@@ -414,7 +424,7 @@ foreach ($data['inventory_fields'] as $inventory_no => $inventory_field) {
 	}
 
 	$inventory_tab->addItem([
-		new CLabel($inventory_field['title']),
+		new CLabel($inventory_field['title'], 'host_inventory['.$field_name.']'),
 		new CFormField([$input_field, $inventory_item])
 	]);
 }
diff --git a/ui/app/partials/js/configuration.host.edit.html.js.php b/ui/app/partials/js/configuration.host.edit.html.js.php
index c102e0334bb..942ac098292 100644
--- a/ui/app/partials/js/configuration.host.edit.html.js.php
+++ b/ui/app/partials/js/configuration.host.edit.html.js.php
@@ -148,7 +148,7 @@
 
 			$groups_ms.on('change', (e) => {
 				$groups_ms.multiSelect('setDisabledEntries',
-					[... document.querySelectorAll('[name^="groups["]')].map((input) => input.value)
+					[... this.form.querySelectorAll('[name^="groups["]')].map((input) => input.value)
 				);
 			});
 		},
diff --git a/ui/app/partials/layout.htmlpage.header.php b/ui/app/partials/layout.htmlpage.header.php
index 621bd06563e..5a343ccc248 100644
--- a/ui/app/partials/layout.htmlpage.header.php
+++ b/ui/app/partials/layout.htmlpage.header.php
@@ -24,7 +24,7 @@
  * @var array    $data
  */
 
-global $DB, $ZBX_SERVER, $ZBX_SERVER_NAME, $ZBX_SERVER_PORT;
+global $DB, $ZBX_SERVER_NAME;
 
 $theme = ZBX_DEFAULT_THEME;
 $scripts = $data['javascript']['files'];
diff --git a/ui/app/partials/monitoring.latest.filter.php b/ui/app/partials/monitoring.latest.filter.php
index 2afa2fda165..3ecfb6399fd 100644
--- a/ui/app/partials/monitoring.latest.filter.php
+++ b/ui/app/partials/monitoring.latest.filter.php
@@ -29,7 +29,7 @@ $filter_view_data = array_key_exists('filter_view_data', $data) ? $data['filter_
 $left_column = (new CFormGrid())
 	->addClass(CFormGrid::ZBX_STYLE_FORM_GRID_LABEL_WIDTH_TRUE)
 	->addItem([
-		new CLabel(_('Host groups'), 'groupids__ms'),
+		new CLabel(_('Host groups'), 'groupids_#{uniqid}_ms'),
 		new CFormField(
 			(new CMultiSelect([
 				'name' => 'groupids[]',
@@ -53,7 +53,7 @@ $left_column = (new CFormGrid())
 		)
 	])
 	->addItem([
-		new CLabel(_('Hosts'), 'hostids__ms'),
+		new CLabel(_('Hosts'), 'hostids_#{uniqid}_ms'),
 		new CFormField(
 			(new CMultiSelect([
 				'name' => 'hostids[]',
@@ -169,7 +169,7 @@ $right_column = (new CFormGrid())
 		new CFormField($tag_format_line)
 	])
 	->addItem([
-		new CLabel(_('Tag display priority')),
+		new CLabel(_('Tag display priority'), 'tag_priority_#{uniqid}'),
 		new CFormField(
 			(new CTextBox('tag_priority', $data['tag_priority']))
 				->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH)
@@ -179,12 +179,11 @@ $right_column = (new CFormGrid())
 		)
 	])
 	->addItem([
-		new CLabel(_('Show details')),
+		new CLabel(_('Show details'), 'show_details'),
 		new CFormField([
 			(new CCheckBox('show_details'))
 				->setChecked($data['show_details'] == 1)
 				->setUncheckedValue(0)
-				->removeId()
 		])
 	]);
 
diff --git a/ui/app/partials/scheduledreport.formgrid.html.php b/ui/app/partials/scheduledreport.formgrid.html.php
index b4f1576085f..04bb1e18606 100644
--- a/ui/app/partials/scheduledreport.formgrid.html.php
+++ b/ui/app/partials/scheduledreport.formgrid.html.php
@@ -104,7 +104,7 @@ $form_grid
 		)
 	])
 	->addItem([
-		new CLabel(_('Start time')),
+		new CLabel(_('Start time'), 'hours'),
 		new CFormField(
 			(new CDiv([
 				(new CNumericBox('hours', $data['hours'], 2))