luci-app-banip: sync with release 0.9.4-1
* small changes to support the new destination port & protocol options in the feed editor and in the reporting engine Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
parent
50846d90fe
commit
85c0429651
2 changed files with 5 additions and 4 deletions
|
@ -236,12 +236,11 @@ return view.extend({
|
||||||
}
|
}
|
||||||
|
|
||||||
o = s.option(form.Value, 'flag', _('Flag'));
|
o = s.option(form.Value, 'flag', _('Flag'));
|
||||||
o.datatype = 'and(minlength(2),maxlength(2))';
|
|
||||||
o.validate = function (section_id, value) {
|
o.validate = function (section_id, value) {
|
||||||
if (!value) {
|
if (!value) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!value.match(/^gz$/)) {
|
if (!value.match(/^(\bgz\b|\btcp\b|\budp\b|\b[0-9\-]+\b| )*$/)) {
|
||||||
return _('Flag not supported');
|
return _('Flag not supported');
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -155,7 +155,8 @@ return view.extend({
|
||||||
E('th', { 'class': 'th right', 'style': 'padding-right: 20px' }, _('Elements')),
|
E('th', { 'class': 'th right', 'style': 'padding-right: 20px' }, _('Elements')),
|
||||||
E('th', { 'class': 'th' }, _('WAN-Input (packets)')),
|
E('th', { 'class': 'th' }, _('WAN-Input (packets)')),
|
||||||
E('th', { 'class': 'th' }, _('WAN-Forward (packets)')),
|
E('th', { 'class': 'th' }, _('WAN-Forward (packets)')),
|
||||||
E('th', { 'class': 'th' }, _('LAN-Forward (packets)'))
|
E('th', { 'class': 'th' }, _('LAN-Forward (packets)')),
|
||||||
|
E('th', { 'class': 'th' }, _('Port/Protocol Limit'))
|
||||||
])
|
])
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
@ -170,7 +171,8 @@ return view.extend({
|
||||||
E('em', { 'style': 'padding-right: 20px' }, content.sets[key].cnt_elements),
|
E('em', { 'style': 'padding-right: 20px' }, content.sets[key].cnt_elements),
|
||||||
E('em', content.sets[key].input + cnt1),
|
E('em', content.sets[key].input + cnt1),
|
||||||
E('em', content.sets[key].wan_forward + cnt2),
|
E('em', content.sets[key].wan_forward + cnt2),
|
||||||
E('em', content.sets[key].lan_forward + cnt3)
|
E('em', content.sets[key].lan_forward + cnt3),
|
||||||
|
E('em', content.sets[key].port)
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
rowSets.push([
|
rowSets.push([
|
||||||
|
|
Loading…
Reference in a new issue