luci-app-firewall: fix zone log option #7648
Conversation
|
but how then to disable logging? |
| @@ -293,11 +293,40 @@ return view.extend({ | |||
| for (var i = 0; i < ctHelpers.length; i++) | |||
| o.value(ctHelpers[i].name, E('<span><span class="hide-close">%s (%s)</span><span class="hide-open">%s</span></span>'.format(ctHelpers[i].description, ctHelpers[i].name.toUpperCase(), ctHelpers[i].name.toUpperCase()))); | |||
|
|
|||
| o = s.taboption('advanced', form.Flag, 'log', _('Enable logging on this zone')); | |||
| o = s.taboption('advanced', form.MultiValue, 'log', _('Enable logging for selected tables in this zone:'), _('Log matched packets on the selected tables to syslog.')); | |||
There was a problem hiding this comment.
why not just a dropdown? Looks over complicated and difficult to maintain
There was a problem hiding this comment.
Do you mean LuCI.ui.Dropdown?
I´d have to take a look at how to implement that, seems that needs something like form.MultiValue.extend right?
There was a problem hiding this comment.
MultiValue is a Dropdown, I think. (inherit)
There was a problem hiding this comment.
Maybe shorten the UI heading to Enable logging.
There was a problem hiding this comment.
Updated the heading.
If you deselect all options the resulting value is
This is the result of: |
applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
Outdated
Show resolved
Hide resolved
Changes the zone log checkbox to a multivalue selection as the underlying uci option is a bitfield. Signed-off-by: Jan Froch <[email protected]>
JFroch
force-pushed
the
fw_fix_zone_log
branch
from
0052dc5 to
1189fb4
Compare
|
Merged. Thanks @JFroch |
Signed-off-by: <[email protected]>row (viagit commit --signoff)<package name>: titlefirst line subject for packagesPKG_VERSIONin the MakefileThis PR changes the zone log checkbox to a multivalue selection.
From the documentation: