firewall: categories improvements #4790
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AdSchellevis
requested changes
Mar 9, 2021
| @@ -242,6 +242,10 @@ function hook_firewall_categories() { | |||
| $(".rule").each(function(){ | |||
| let is_selected = false; | |||
| $(this).data('category').split(',').forEach(function(item){ | |||
| if (selected_values.indexOf("(No Category)") > -1 && item === "") { | |||
There was a problem hiding this comment.
doesn't take translations into account. when "no category" is always on top it's probably better to check if the first element of the selector is checked.
There was a problem hiding this comment.
Thanks for the heads up, silly mistake. See new commit.
| @@ -257,5 +261,6 @@ function hook_firewall_categories() { | |||
| $(".opnsense-rules").change(); | |||
| }); | |||
| cat_select.change(); | |||
| $('[data-toggle="tooltip"]').tooltip(); | |||
There was a problem hiding this comment.
I'm not sure if it matters, but in case existing selectors don't like being triggered twice, you can always add a unique class to the items added and only trigger those,
2 tasks
AdSchellevis
pushed a commit
that referenced
this pull request
Mar 14, 2021
AdSchellevis
pushed a commit
that referenced
this pull request
Mar 14, 2021
fichtner
pushed a commit
that referenced
this pull request
Mar 28, 2021
(cherry picked from commit c7d2488)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit adds the option of filtering on (No Category) in the firewall rules. A tooltip for visual aid is also added. In order to run static text through gettext(), a separate API endpoint has been created. This is a clean PR and invalidates the old one (#4775) since it was pretty messy.