luci-app-banip: fix last, incomplete commit

Signed-off-by: Dirk Brenken <dev@brenken.org>
lvoegl · Oct 4, 2023 · 127ca64 · 127ca64
1 parent 71de98e
commit 127ca64
Show file tree

Hide file tree

Showing 38 changed files with 6,086 additions and 6,090 deletions.
diff --git a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/overview.js b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/overview.js
@@ -297,23 +297,16 @@ return view.extend({
 		o.optional = true;
 		o.retain = true;
 
-		o = s.taboption('general', widgets.NetworkSelect, 'ban_trigger', _('Startup Trigger Interface'), _('List of available network interfaces to trigger the banIP start.'));
+		o = s.taboption('general', widgets.NetworkSelect, 'ban_trigger', _('Reload Trigger Interface'), _('List of available reload trigger interface(s).'));
 		o.multiple = true;
 		o.nocreate = true;
 		o.rmempty = true;
 
-		o = s.taboption('general', form.Value, 'ban_triggerdelay', _('Trigger Delay'), _('Additional trigger delay in seconds before banIP processing actually starts.'));
+		o = s.taboption('general', form.Value, 'ban_triggerdelay', _('Trigger Delay'), _('Additional trigger delay in seconds during interface reload and boot.'));
 		o.placeholder = '10';
 		o.datatype = 'range(1,300)';
 		o.rmempty = true;
 
-		o = s.taboption('general', form.ListValue, 'ban_triggeraction', _('Trigger Action'), _('Trigger action on ifup interface events.'));
-		o.value('start', _('start (default)'));
-		o.value('reload', _('reload'));
-		o.value('restart', _('restart'));
-		o.optional = true;
-		o.rmempty = true;
-
 		o = s.taboption('general', form.ListValue, 'ban_fetchretry', _('Download Retries'), _('Number of download attempts in case of an error (not supported by uclient-fetch).'));
 		o.value('1', _('1'));
 		o.value('3', _('3'));
@@ -422,10 +415,9 @@ return view.extend({
 		o.optional = true;
 		o.rmempty = true;
 
-		o = s.taboption('general', form.ListValue, 'ban_triggeraction', _('Trigger Action'), _('Trigger action on ifup interface events.'));
-		o.value('start', _('start (default)'));
-		o.value('reload', _('reload'));
-		o.value('restart', _('restart'));
+		o = s.taboption('adv_chain', form.ListValue, 'ban_blocktype', _('Block Type'), _('Drop packets silently or actively reject the traffic on WAN-Input and WAN-Forward chains.'));
+		o.value('drop', _('drop (default)'));
+		o.value('reject', _('reject'));
 		o.optional = true;
 		o.rmempty = true;