Skip to content

luci-app-nut: update deprecated config names #8434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
danielfdickinson wants to merge 1 commit into from
Closed

luci-app-nut: update deprecated config names #8434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 60 additions & 2 deletions applications/luci-app-nut/htdocs/luci-static/resources/view/nut/nut_monitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ return view.extend({
o.default = false;
}

s = m.section(form.TypedSection, 'master', _('UPS Primary'));
s = m.section(form.TypedSection, 'primary', _('UPS Primary'));
s.optional = true;
s.addremove = true;
s.anonymous = true;
Expand Down Expand Up @@ -177,7 +177,65 @@ return view.extend({
o.optional = false;
o.password = true;

s = m.section(form.TypedSection, 'slave', _('UPS Auxiliary'));
s = m.section(form.TypedSection, 'secondary', _('UPS Auxiliary'));
s.optional = true;
s.addremove = true;
s.anonymous = true;

o = s.option(form.Value, 'upsname', _('Name of UPS'), _('As configured by NUT'));
o.optional = false;

o = s.option(form.Value, 'hostname', _('Hostname or address of UPS'));
o.optional = false;
o.datatype = 'or(host,ipaddr)';

o = s.option(form.Value, 'port', _('Port'));
o.optional = true;
o.placeholder = 3493;
o.datatype = 'port';

o = s.option(form.Value, 'powervalue', _('Power value'));
o.optional = false;
o.datatype = 'uinteger';
o.default = 1;

o = s.option(form.Value, 'username', _('Username'));
o.optional = false;

o = s.option(form.Value, 'password', _('Password'));
o.optional = false;
o.password = true;

s = m.section(form.TypedSection, 'master', _('UPS Primary (deprecated)'), _('Uses deprecated section name. Please convert to "UPS Primary"'));
s.optional = true;
s.addremove = true;
s.anonymous = true;

o = s.option(form.Value, 'upsname', _('Name of UPS'), _('As configured by NUT'));
o.optional = false;

o = s.option(form.Value, 'hostname', _('Hostname or address of UPS'));
o.optional = false;
o.datatype = 'or(host,ipaddr)';

o = s.option(form.Value, 'port', _('Port'));
o.optional = true;
o.placeholder = 3493;
o.datatype = 'port';

o = s.option(form.Value, 'powervalue', _('Power value'));
o.optional = false;
o.datatype = 'uinteger';
o.default = 1;

o = s.option(form.Value, 'username', _('Username'));
o.optional = false;

o = s.option(form.Value, 'password', _('Password'));
o.optional = false;
o.password = true;

s = m.section(form.TypedSection, 'slave', _('UPS Auxiliary (deprecated)'), _('Uses deprecated section name. Please convert to "UPS Auxilary"'));
s.optional = true;
s.addremove = true;
s.anonymous = true;
Expand Down
6 changes: 4 additions & 2 deletions applications/luci-app-nut/htdocs/luci-static/resources/view/nut/nut_server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ return view.extend({
o.optional = true;

o = s.option(form.ListValue, 'upsmon', _('Role'));
o.value('slave', _('Auxiliary'));
o.value('master', _('Primary'));
o.value('secondary', _('Auxiliary'));
o.value('primary', _('Primary'));
o.value('slave', _('Auxiliary (deprecated)'));
o.value('master', _('Primary (deprecated)'));
o.optional = false;

// Listen settings
Expand Down
Loading