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

(ids) fix for https://github.com/opnsense/core/issues/314

Browse Source 
This patch fixes a few different issues.
- Prevent the user from selecting all rules at once, the browser probably can't render that amount of data resulting in sloppy behaviour.
- When querying the alerts, show an overlay during the process. This might take some time, depending on the amount of logged items
- Change number of rows selection to more sane defaults.
- Refresh data after "apply selection", to return to the right page
This commit is contained in:
Ad Schellevis 2015-08-13 17:23:33 +02:00
parent 46d6159477
commit 0bfa4a0a30
1 changed files with 60 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/opnsense/mvc/app/views/OPNsense/IDS/index.volt
View File

@ -95,12 +95,24 @@ POSSIBILITY OF SUCH DAMAGE.
}
/**
* Add fileid to alert filter
* add filter criteria to log query
*/
function addAlertQryFilters(request) {
var selected =$('#alert-logfile').find("option:selected").val();
if ( selected != "") {
request['fileid'] = selected;
var selected_logfile =$('#alert-logfile').find("option:selected").val();
var selected_max_entries =$('#alert-logfile-max').find("option:selected").val();
var search_phrase = $("#inputSearchAlerts").val();
// add loading overlay
$('#processing-dialog').modal('show');
$("#grid-alerts").bootgrid().on("loaded.rs.jquery.bootgrid", function (e){
$('#processing-dialog').modal('hide');
});
if ( selected_logfile != "") {
request['fileid'] = selected_logfile;
request['rowCount'] = selected_max_entries;
request['searchPhrase'] = search_phrase;
}
return request;
}
@ -170,7 +182,7 @@ POSSIBILITY OF SUCH DAMAGE.
// refresh when all toggles are executed
$.when.apply(null, deferreds).done(function(){
$("#"+gridId).bootgrid("reload");
$("#"+gridId).bootgrid("refresh");
});
}
}
@ -200,6 +212,7 @@ POSSIBILITY OF SUCH DAMAGE.
get:'/api/ids/settings/getRuleInfo/',
options:{
requestHandler:addRuleFilters,
rowCount:[10, 25, 50,100,500,1000] ,
formatters:{
rowtoggle: function (column, row) {
var toggle = " <button type=\"button\" class=\"btn btn-xs btn-default command-edit\" data-row-id=\"" + row.sid + "\"><span class=\"fa fa-info-circle\"></span></button> ";
@ -227,12 +240,15 @@ POSSIBILITY OF SUCH DAMAGE.
options:{
multiSelect:false,
selection:false,
templates : {
header: ""
},
requestHandler:addAlertQryFilters,
formatters:{
info: function (column, row) {
return "<button type=\"button\" class=\"btn btn-xs btn-default command-edit\" data-row-id=\"" + row.filepos + "\"><span class=\"fa fa-info-circle\"></span></button> ";
}
}
},
}
});
}
@ -343,6 +359,13 @@ POSSIBILITY OF SUCH DAMAGE.
actionToggleSelected(gridId, url, 1, 100);
});
/**
* link query alerts button.
*/
$("#actQueryAlerts").click(function(){
$('#grid-alerts').bootgrid('reload');
});
/**
* Initialize
*/
@ -442,6 +465,23 @@ POSSIBILITY OF SUCH DAMAGE.
<div class="row">
<div class="col-sm-12 actionBar">
<select id="alert-logfile" class="selectpicker" data-width="200px"></select>
<select id="alert-logfile-max" class="selectpicker" data-width="80px">
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="50">50</option>
<option value="100">100</option>
<option value="250">250</option>
<option value="500">500</option>
<option value="1000">1000</option>
<option value="-1">All</option>
</select>
<div class="search form-group">
<div class="input-group">
<input class="search-field form-control" placeholder="{{ lang._('Search') }}" type="text" id="inputSearchAlerts">
<span id="actQueryAlerts" class="icon input-group-addon fa fa-refresh" title="{{ lang._('Query') }}" style="cursor: pointer;"></span>
</div>
</div>
</div>
</div>
</div>
@ -469,5 +509,19 @@ POSSIBILITY OF SUCH DAMAGE.
</div>
</div>
<!-- Static Modal -->
<div class="modal modal-static fade" id="processing-dialog" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body">
<div class="text-center">
<i class="fa fa-spinner fa-pulse fa-5x"></i>
<h4>{{ lang._('Processing request...') }} </h4>
</div>
</div>
</div>
</div>
</div>
{{ partial("layout_partials/base_dialog",['fields':formDialogRule,'id':'DialogRule','label':'Rule details','hasSaveBtn':'false','msgzone_width':1])}}
{{ partial("layout_partials/base_dialog",['fields':formDialogAlert,'id':'DialogAlert','label':'Alert details','hasSaveBtn':'false','msgzone_width':1])}}