summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-statistics/htdocs/luci-static/resources
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2021-04-27 10:09:05 +0200
committerJo-Philipp Wich <jo@mein.io>2021-04-27 10:17:05 +0200
commit8816c8fff7e8e30f19e85c0f1c7f70b6914be701 (patch)
treed77b437242589003bb934ef5557df4ee79b6c0e8 /applications/luci-app-statistics/htdocs/luci-static/resources
parentc6b4d4ab5a2c57889bcf14fafac17e73d22205c6 (diff)
luci-app-statistics: treat APC UPS "host" setting as single value option
Existing Lua code incorrectly stated that the "Host" option takes a space sparated list of hostnames which is not the case since the collect plugin does not handle multiple hosts. This change reverts the configuration to a simple value as proposed by the original PR and adjusts the config summary accordingly, while retaining the translation string. Ref: https://github.com/openwrt/luci/pull/5010#issuecomment-827285319 Fixes: dd5d96afd ("luci-app-statistics: fix APC UPS host configuration") Fixes: e7d22dce5 ("luci-app-statistics: convert collectd configuration to client side views") Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'applications/luci-app-statistics/htdocs/luci-static/resources')
-rw-r--r--applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js12
1 files changed, 2 insertions, 10 deletions
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js
index 17ec51be53..32f0cecdab 100644
--- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/apcups.js
@@ -11,13 +11,10 @@ return baseclass.extend({
o = s.option(form.Flag, 'enable', _('Enable this plugin'));
- o = s.option(form.DynamicList, 'Host', _('Monitor host'));
+ o = s.option(form.Value, 'Host', _('Monitor host'));
o.default = 'localhost';
o.datatype = 'host';
o.depends('enable', '1');
- o.write = function(section_id, value) {
- return form.Value.prototype.write.call(this, section_id, L.toArray(value).join(' '));
- };
o = s.option(form.Value, 'Port', _('Port for apcupsd communication'));
o.default = '3551';
@@ -26,11 +23,6 @@ return baseclass.extend({
},
configSummary: function(section) {
- var hosts = L.toArray(section.Host);
- if (hosts.length)
- return N_(hosts.length,
- 'Monitoring APC UPS at host %s, port %d',
- 'Monitoring APC UPS at hosts %s, port %d'
- ).format(hosts.join(', '), section.Port || 3551);
+ return _('Monitoring APC UPS at host %s, port %d').format(section.Host || 'localhost', section.Port || 3551);
}
});