diff options
| author | Gregory Chalenko <gregory.chalenko@zabbix.com> | 2020-11-19 10:45:19 +0300 |
|---|---|---|
| committer | Gregory Chalenko <gregory.chalenko@zabbix.com> | 2020-11-19 10:45:19 +0300 |
| commit | cc01938454d05428a0d44973d1f907cf4cf8cc7f (patch) | |
| tree | adda9d87296585e512ba4f223ca0c312011a4d79 /ui | |
| parent | 7fea51ab48893ee182002c8bf1794cd3cec7eed3 (diff) | |
..F....... [ZBXNEXT-6314] fixed details property on monitoring>hosts page
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/controllers/CControllerHost.php | 2 | ||||
| -rw-r--r-- | ui/include/html.inc.php | 6 | ||||
| -rw-r--r-- | ui/include/items.inc.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ui/app/controllers/CControllerHost.php b/ui/app/controllers/CControllerHost.php index 3d6d0837b23..ad8ff8fc88b 100644 --- a/ui/app/controllers/CControllerHost.php +++ b/ui/app/controllers/CControllerHost.php @@ -155,7 +155,7 @@ abstract class CControllerHost extends CController { // Get additional data to limited host amount. $hosts = API::Host()->get([ 'output' => ['hostid', 'name', 'status', 'maintenance_status', 'maintenanceid', 'maintenance_type'], - 'selectInterfaces' => ['ip', 'dns', 'port', 'main', 'type', 'useip', 'available', 'error'], + 'selectInterfaces' => ['ip', 'dns', 'port', 'main', 'type', 'useip', 'available', 'error', 'details'], 'selectGraphs' => API_OUTPUT_COUNT, 'selectHttpTests' => API_OUTPUT_COUNT, 'selectTags' => ['tag', 'value'], diff --git a/ui/include/html.inc.php b/ui/include/html.inc.php index 29e8953b599..6af0e46b50f 100644 --- a/ui/include/html.inc.php +++ b/ui/include/html.inc.php @@ -623,9 +623,9 @@ function getHostAvailabilityTable($host_interfaces) { if ($interface['type'] == INTERFACE_TYPE_SNMP) { $version = $interface['details']['version']; - $description = vsprintf('%s%d, %s: %s', ($version == SNMP_V3) - ? [_('SNMPv'), $version, _('Context name'), $interface['details']['contextname']] - : [_('SNMPv'), $version, _x('Community', 'SNMP Community'), $interface['details']['community']] + $description = vsprintf('%s, %s: %s', ($version == SNMP_V3) + ? [_s('SNMPv%1$d', $version), _('Context name'), $interface['details']['contextname']] + : [_s('SNMPv%1$d', $version), _x('Community', 'SNMP Community'), $interface['details']['community']] ); } diff --git a/ui/include/items.inc.php b/ui/include/items.inc.php index 8d355ce1bf5..3ea4c19478e 100644 --- a/ui/include/items.inc.php +++ b/ui/include/items.inc.php @@ -1264,11 +1264,11 @@ function getInterfaceSelect(array $interfaces): CSelect { if ($interface['type'] == INTERFACE_TYPE_SNMP) { $version = $interface['details']['version']; if ($version == SNMP_V3) { - $option->setExtra('description', sprintf('%s%d, %s: %s', _('SNMPv'), $version, + $option->setExtra('description', sprintf('%s, %s: %s', _s('SNMPv%1$d', $version), _('Context name'), $interface['details']['contextname'] )); } else { - $option->setExtra('description', sprintf('%s%d, %s: %s', _('SNMPv'), $version, + $option->setExtra('description', sprintf('%s, %s: %s', _s('SNMPv%1$d', $version), _x('Community', 'SNMP Community'), $interface['details']['community'] )); } |