From d3bc503cf6d60eb69a4a2b89e2a6ba9630e36806 Mon Sep 17 00:00:00 2001 From: SourceDoctor Date: Tue, 24 Mar 2020 16:02:48 +0100 Subject: [PATCH] Global Settings - force_ip_to_sysname, force_hostname_to_sysname (#11335) * Global Settings - force_ip_to_sysname, force_hostname_to_sysname * add manifest.json * Update mix-manifest.json Co-authored-by: Tony Murray --- html/mix-manifest.json | 12 ++++++------ misc/config_definitions.json | 8 +++++++- resources/lang/en/settings.php | 8 ++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/html/mix-manifest.json b/html/mix-manifest.json index 3562804b71..8f4d5e172d 100644 --- a/html/mix-manifest.json +++ b/html/mix-manifest.json @@ -3,10 +3,10 @@ "/css/app.css": "/css/app.css?id=5da3bf931f2f95a17884", "/js/manifest.js": "/js/manifest.js?id=3c768977c2574a34506e", "/js/vendor.js": "/js/vendor.js?id=29212a758157c575d7f8", - "/js/lang/de.js": "/js/lang/de.js?id=e0623715e8df0895188b", - "/js/lang/en.js": "/js/lang/en.js?id=dc0b30f45a6a50b8bc85", - "/js/lang/fr.js": "/js/lang/fr.js?id=2d1159debd99a1909f12", - "/js/lang/ru.js": "/js/lang/ru.js?id=b007ddce75134acbe635", - "/js/lang/uk.js": "/js/lang/uk.js?id=146819d3cf1dfb16672d", - "/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=5a3eb23117cb4d5dcbbb" + "/js/lang/de.js": "/js/lang/de.js?id=18b0b0e06813d1afed92", + "/js/lang/en.js": "/js/lang/en.js?id=41955f4356f6511b76b6", + "/js/lang/fr.js": "/js/lang/fr.js?id=4f329163511445d92a17", + "/js/lang/ru.js": "/js/lang/ru.js?id=e10e85f321f1395378b6", + "/js/lang/uk.js": "/js/lang/uk.js?id=c8d4937e3ca47b60b7ac", + "/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=8020327e80ac10c0c615" } diff --git a/misc/config_definitions.json b/misc/config_definitions.json index d6779c6e6e..56c6f7a828 100644 --- a/misc/config_definitions.json +++ b/misc/config_definitions.json @@ -790,7 +790,7 @@ "type": "boolean" }, "device_location_map_open": { - "order": 0, + "order": 2, "group": "webui", "section": "device", "default": false, @@ -1481,10 +1481,16 @@ "type": "text" }, "force_hostname_to_sysname": { + "group": "webui", + "section": "device", + "order": 0, "default": false, "type": "boolean" }, "force_ip_to_sysname": { + "group": "webui", + "section": "device", + "order": 1, "default": false, "type": "boolean" }, diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php index 9a55ab6961..9c4c47cbe2 100644 --- a/resources/lang/en/settings.php +++ b/resources/lang/en/settings.php @@ -1252,6 +1252,14 @@ return [ 'description' => 'Location Map open', 'help' => 'Location Map is shown by default' ], + 'force_hostname_to_sysname' => [ + 'description' => 'use SNMP SysName instead of Hostname', + 'help' => 'When using a dynamic DNS hostname or one that does not resolve, this option would allow you to make use of the SNMP sysName instead as the preferred reference to the device' + ], + 'force_ip_to_sysname' => [ + 'description' => 'use SNMP SysName instead of IP Address', + 'help' => 'When using IP addresses as a hostname you can instead represent the devices on the WebUI by its SNMP sysName resulting in an easier to read overview of your network. This would apply on networks where you don\'t have DNS records for most of your devices' + ], 'whois' => [ 'description' => 'Path to whois' ]