summaryrefslogtreecommitdiff
path: root/luci2/htdocs/luci2/view
diff options
context:
space:
mode:
Diffstat (limited to 'luci2/htdocs/luci2/view')
-rw-r--r--luci2/htdocs/luci2/view/network.interfaces.js2
-rw-r--r--luci2/htdocs/luci2/view/network.switch.js28
-rw-r--r--luci2/htdocs/luci2/view/system.users.js36
3 files changed, 33 insertions, 33 deletions
diff --git a/luci2/htdocs/luci2/view/network.interfaces.js b/luci2/htdocs/luci2/view/network.interfaces.js
index a344327..a821ef5 100644
--- a/luci2/htdocs/luci2/view/network.interfaces.js
+++ b/luci2/htdocs/luci2/view/network.interfaces.js
@@ -274,7 +274,7 @@ L.ui.view.extend({
renderInterfaceForm: function(network)
{
- var m = new L.cbi.Modal('network', {
+ var m = new L.cbi.Map('network', {
tabbed: true,
caption: 'Interface config',
description: 'I can config interface!!!!'
diff --git a/luci2/htdocs/luci2/view/network.switch.js b/luci2/htdocs/luci2/view/network.switch.js
index 39a5b0b..057955e 100644
--- a/luci2/htdocs/luci2/view/network.switch.js
+++ b/luci2/htdocs/luci2/view/network.switch.js
@@ -49,7 +49,7 @@ L.ui.view.extend({
if (val == 'u')
{
var u = false;
- var sections = self.section.sections();
+ var sections = self.ownerSection.getUCISections();
for (var i = 0; i < sections.length; i++)
{
@@ -72,7 +72,7 @@ L.ui.view.extend({
ucivalue: function(sid)
{
- var ports = (this.map.get('network', sid, 'ports') || '').match(/[0-9]+[tu]?/g);
+ var ports = (this.ownerMap.get('network', sid, 'ports') || '').match(/[0-9]+[tu]?/g);
if (ports)
for (var i = 0; i < ports.length; i++)
@@ -187,12 +187,12 @@ L.ui.view.extend({
});
vlans.add = function() {
- var sections = this.sections();
+ var sections = this.getUCISections();
var used_vids = { };
for (var j = 0; j < sections.length; j++)
{
- var v = this.map.get('network', sections[j]['.name'], 'vlan');
+ var v = this.ownerMap.get('network', sections[j]['.name'], 'vlan');
if (v)
used_vids[v] = true;
}
@@ -202,9 +202,9 @@ L.ui.view.extend({
if (used_vids[j.toString()])
continue;
- var sid = this.map.add('network', 'switch_vlan');
- this.map.set('network', sid, 'device', this.options.swname);
- this.map.set('network', sid, 'vlan', j);
+ var sid = this.ownerMap.add('network', 'switch_vlan');
+ this.ownerMap.set('network', sid, 'device', this.options.swname);
+ this.ownerMap.set('network', sid, 'vlan', j);
break;
}
};
@@ -236,7 +236,7 @@ L.ui.view.extend({
var vo = vlans.option(L.cbi.InputValue, vid_opt, {
caption: L.tr('VLAN ID'),
datatype: function(val) {
- var sections = vlans.sections();
+ var sections = vlans.getUCISections();
var used_vids = { };
for (var j = 0; j < sections.length; j++)
@@ -264,16 +264,16 @@ L.ui.view.extend({
});
vo.ucivalue = function(sid) {
- var id = this.map.get('network', sid, vid_opt);
+ var id = this.ownerMap.get('network', sid, vid_opt);
if (isNaN(parseInt(id)))
- id = this.map.get('network', sid, 'vlan');
+ id = this.ownerMap.get('network', sid, 'vlan');
return id;
};
vo.save = function(sid) {
- var old_ports = this.map.get('network', sid, 'ports');
+ var old_ports = this.ownerMap.get('network', sid, 'ports');
var new_ports = '';
for (var j = 0; j < port_opts.length; j++)
@@ -286,13 +286,13 @@ L.ui.view.extend({
}
if (new_ports != old_ports)
- this.map.set('network', sid, 'ports', new_ports);
+ this.ownerMap.set('network', sid, 'ports', new_ports);
if (v4k_opt)
{
- var s = sw.sections();
+ var s = sw.getUCISections();
for (var j = 0; j < s.length; j++)
- this.map.set('network', s[j]['.name'], v4k_opt, '1');
+ this.ownerMap.set('network', s[j]['.name'], v4k_opt, '1');
}
this.callSuper('save', sid);
diff --git a/luci2/htdocs/luci2/view/system.users.js b/luci2/htdocs/luci2/view/system.users.js
index cc495e9..b467a04 100644
--- a/luci2/htdocs/luci2/view/system.users.js
+++ b/luci2/htdocs/luci2/view/system.users.js
@@ -115,8 +115,8 @@ L.ui.view.extend({
.css('cursor', 'pointer')
.click({ level: 2 }, this.setAll)));
- var acl_r = this.aclFromUCI(this.map.get('rpcd', sid, 'read'));
- var acl_w = this.aclFromUCI(this.map.get('rpcd', sid, 'write'));
+ var acl_r = this.aclFromUCI(this.ownerMap.get('rpcd', sid, 'read'));
+ var acl_w = this.aclFromUCI(this.ownerMap.get('rpcd', sid, 'write'));
if (this.choices)
for (var i = 0; i < this.choices.length; i++)
@@ -147,8 +147,8 @@ L.ui.view.extend({
textvalue: function(sid)
{
- var acl_r = this.aclFromUCI(this.map.get('rpcd', sid, 'read'));
- var acl_w = this.aclFromUCI(this.map.get('rpcd', sid, 'write'));
+ var acl_r = this.aclFromUCI(this.ownerMap.get('rpcd', sid, 'read'));
+ var acl_w = this.aclFromUCI(this.ownerMap.get('rpcd', sid, 'write'));
var htmlid = this.id(sid);
var radios = $('#' + htmlid + ' input');
@@ -187,8 +187,8 @@ L.ui.view.extend({
save: function(sid)
{
- var acl_r = this.aclFromUCI(this.map.get('rpcd', sid, 'read'));
- var acl_w = this.aclFromUCI(this.map.get('rpcd', sid, 'write'));
+ var acl_r = this.aclFromUCI(this.ownerMap.get('rpcd', sid, 'read'));
+ var acl_w = this.aclFromUCI(this.ownerMap.get('rpcd', sid, 'write'));
var acl_r_new = [ ];
var acl_w_new = [ ];
@@ -212,16 +212,16 @@ L.ui.view.extend({
}
if (!this.aclEqual(acl_r, acl_r_new))
- this.map.set('rpcd', sid, 'read', this.aclToUCI(acl_r_new));
+ this.ownerMap.set('rpcd', sid, 'read', this.aclToUCI(acl_r_new));
if (!this.aclEqual(acl_w, acl_w_new))
- this.map.set('rpcd', sid, 'write', this.aclToUCI(acl_w_new));
+ this.ownerMap.set('rpcd', sid, 'write', this.aclToUCI(acl_w_new));
}
}),
execute: function() {
var self = this;
- return L.ui.listAvailableACLs().then(function(acls) {
+ return L.ui.getAvailableACLs().then(function(acls) {
var m = new L.cbi.Map('rpcd', {
caption: L.tr('Guest Logins'),
description: L.tr('Manage user accounts and permissions for accessing the LuCI ui.'),
@@ -249,7 +249,7 @@ L.ui.view.extend({
});
shadow.ucivalue = function(sid) {
- var pw = this.map.get('rpcd', sid, 'password');
+ var pw = this.ownerMap.get('rpcd', sid, 'password');
return (pw && pw.indexOf('$p$') == 0);
};
@@ -264,8 +264,8 @@ L.ui.view.extend({
password.toggle = function(sid) {
var id = '#' + this.id(sid);
- var pw = this.map.get('rpcd', sid, 'password');
- var sh = this.section.fields.__shadow.formvalue(sid);
+ var pw = this.ownerMap.get('rpcd', sid, 'password');
+ var sh = this.ownerSection.fields.__shadow.formvalue(sid);
if (!sh && pw && pw.indexOf('$p$') == 0)
$(id).val('');
@@ -274,23 +274,23 @@ L.ui.view.extend({
};
shadow.save = password.save = function(sid) {
- var sh = this.section.fields.__shadow.formvalue(sid);
- var pw = this.section.fields.password.formvalue(sid);
+ var sh = this.ownerSection.fields.__shadow.formvalue(sid);
+ var pw = this.ownerSection.fields.password.formvalue(sid);
if (!sh && !pw)
return;
if (sh)
- pw = '$p$' + this.section.fields.username.formvalue(sid);
+ pw = '$p$' + this.ownerSection.fields.username.formvalue(sid);
if (pw.match(/^\$[0-9p][a-z]?\$/))
{
- if (pw != this.map.get('rpcd', sid, 'password'))
- this.map.set('rpcd', sid, 'password', pw);
+ if (pw != this.ownerMap.get('rpcd', sid, 'password'))
+ this.ownerMap.set('rpcd', sid, 'password', pw);
}
else
{
- var map = this.map;
+ var map = this.ownerMap;
return L.ui.cryptPassword(pw).then(function(crypt) {
map.set('rpcd', sid, 'password', crypt);
});
View Lorry Controller Status