lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

firewall: categories improvements (#4790)

Browse Source
This commit is contained in:
Stephan de Wit 2021-03-11 19:26:17 +01:00 committed by Ad Schellevis
parent d3622fde9b
commit b5b9a2eaa0
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/CategoryController.php
View File

@ -54,6 +54,18 @@ class CategoryController extends ApiMutableModelControllerBase
return $this->searchBase("categories.category", array('name', 'auto', 'color'), "name");
}
/**
* search categories with an empty (no category) at the beginning
* @return array search results
* @throws \ReflectionException
*/
public function searchNoCategoryItemAction()
{
$result = $this->searchBase("categories.category", array('name', 'auto', 'color'), "name");
array_unshift($result['rows'], array('uuid' => "", 'name' => gettext("(No Category)"), 'auto' => "", 'color' => ""));
return $result;
}
/**
* Update category with given properties
* @param string $uuid internal id

10
src/www/javascript/opnsense_legacy.js
View File

@ -180,7 +180,7 @@ function window_highlight_table_option()
*/
function hook_firewall_categories() {
let cat_select = $("#fw_category");
ajaxCall('/api/firewall/category/searchItem', {}, function(data){
ajaxCall('/api/firewall/category/searchNoCategoryItem', {}, function(data){
if (data.rows !== undefined && data.rows.length > 0) {
let color_map = {};
for (let i=0; i < data.rows.length ; ++i) {
@ -200,7 +200,7 @@ function hook_firewall_categories() {
// suffix category color in the description td
let td = row.find('td.rule-description');
if (td.length > 0) {
td.append($("<i class='fa fa-circle'/>").css('color', '#'+color_map[item]));
td.append($("<i class='fa fa-circle selector-item' title='"+item+"'/>").css('color', '#'+color_map[item]));
}
}
});
@ -239,9 +239,14 @@ function hook_firewall_categories() {
window.sessionStorage.setItem("firewall.selected.categories", cat_select.val().join(','));
}
let selected_values = cat_select.val();
let no_cat = cat_select.find("option")[0].value;
$(".rule").each(function(){
let is_selected = false;
$(this).data('category').split(',').forEach(function(item){
if (selected_values.indexOf(no_cat) > -1 && item === "") {
// No category for this rule
is_selected = true;
}
if (selected_values.indexOf(item) > -1) {
is_selected = true;
}
@ -257,5 +262,6 @@ function hook_firewall_categories() {
$(".opnsense-rules").change();
});
cat_select.change();
$('.selector-item').tooltip();
});
}