tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed problems with save filter, doens't save agent.

This commit is contained in:
m-lopez-f 2015-11-30 14:10:01 +01:00
parent cb5a5e62f3
commit 5ffaca44e7
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/operation/events/events.php
View File

@ -207,7 +207,7 @@ $open_filter = (int) get_parameter('open_filter', 0);
$date_from = (string)get_parameter('date_from', '');
$date_to = (string)get_parameter('date_to', '');
$text_agent = (string) get_parameter("text_agent", __("All"));
$text_agent = (string) io_safe_output( get_parameter("text_agent", __("All")) );
$id_agent = get_parameter('id_agent', 0);
if ($id_agent != 0) {
$text_agent = db_get_value('nombre', 'tagente', 'id_agente', $id_agent);
@ -215,6 +215,9 @@ if ($id_agent != 0) {
$text_agent = '';
}
}
else {
$id_agent = agents_get_agent_id ($text_agent,true);
}
$text_module = (string) get_parameter('module_search', '');
@ -255,6 +258,7 @@ $params = "search=" . rawurlencode(io_safe_input($search)) .
"&recursion=" . $recursion .
"&refr=" . (int)get_parameter("refr", 0) .
"&id_agent=" . $id_agent .
"&text_agent=" . $text_agent .
"&pagination=" . $pagination .
"&group_rep=" . $group_rep .
"&event_view_hr=" . $event_view_hr .
@ -273,9 +277,6 @@ $params = "search=" . rawurlencode(io_safe_input($search)) .
"&date_to=" . $date_to .
"&pure=" . $config["pure"];
if ($meta) {
$params .= "&text_agent=" . $text_agent;
}
$url = "index.php?sec=eventos&sec2=operation/events/events&" . $params;

14
pandora_console/operation/events/events_list.php
View File

@ -130,7 +130,11 @@ echo "<div id='show_filter_error'>";
echo "</div>";
if ($id_agent == 0 && $text_agent != __('All')) {
$id_agent = -1;
$agente_id = agents_get_agent_id ($text_agent);
if ($agente_id)
$id_agent = $agente_id;
else
$id_agent = -1;
}
/////////////////////////////////////////////
@ -669,7 +673,7 @@ $(document).ready( function() {
$("#severity").val(-1);
$("#status").val(3);
$("#text-search").val('');
$("#text_id_agent").val( <?php echo '"' . __('All') . '"' ?> );
$("#text-text_agent").val( <?php echo '"' . __('All') . '"' ?> );
$("#pagination").val(25);
$("#text-event_view_hr").val(8);
$("#id_user_ack").val(0);
@ -709,7 +713,7 @@ $(document).ready( function() {
if (i == 'search')
$("#text-search").val(val);
if (i == 'text_agent')
$("#text_id_agent").val(val);
$("#text-text_agent").val(val);
if (i == 'pagination')
$("#pagination").val(val);
if (i == 'event_view_hr')
@ -780,7 +784,7 @@ $(document).ready( function() {
"severity" : $("#severity").val(),
"status" : $("#status").val(),
"search" : $("#text-search").val(),
"text_agent" : $("#text_id_agent").val(),
"text_agent" : $("#text-text_agent").val(),
"pagination" : $("#pagination").val(),
"event_view_hr" : $("#text-event_view_hr").val(),
"id_user_ack" : $("#id_user_ack").val(),
@ -850,7 +854,7 @@ $(document).ready( function() {
"severity" : $("#severity").val(),
"status" : $("#status").val(),
"search" : $("#text-search").val(),
"text_agent" : $("#text_id_agent").val(),
"text_agent" : $("#text-text_agent").val(),
"pagination" : $("#pagination").val(),
"event_view_hr" : $("#text-event_view_hr").val(),
"id_user_ack" : $("#id_user_ack").val(),