tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 07:44:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9107-13702-Problemas-filtro-de-eventos' into 'develop'

Browse Source 
Ent 9107 13702 problemas filtro de eventos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9107

See merge request artica/pandorafms!5017
This commit is contained in:
Jimmy Olano 2022-08-29 11:47:07 +00:00
commit bacade22ad
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/agentes/agent_manager.php
View File

@ -307,7 +307,7 @@ $table_ip .= '<div class="label_select_child_right">'.html_print_input(
'type' => 'switch', 'type' => 'switch',
'id' => 'fixed_ip', 'id' => 'fixed_ip',
'name' => 'fixed_ip', 'name' => 'fixed_ip',
'value' => $fixed_ip 'value' => $fixed_ip,
] ]
).__('Fix IP address').ui_print_help_tip(__('Avoid automatic IP address update when agent IP changes.'), true).'</div>'; ).__('Fix IP address').ui_print_help_tip(__('Avoid automatic IP address update when agent IP changes.'), true).'</div>';

10
pandora_console/include/ajax/events.php
View File

@ -777,7 +777,7 @@ if ($save_filter_modal) {
$data[1] .= html_print_select( $data[1] .= html_print_select(
$user_groups_array, $user_groups_array,
'id_group_filter', 'id_group_filter_dialog',
$id_group_filter, $id_group_filter,
'', '',
'', '',
@ -884,7 +884,7 @@ function save_new_filter() {
"page" : "include/ajax/events", "page" : "include/ajax/events",
"save_event_filter" : 1, "save_event_filter" : 1,
"id_name" : $("#text-id_name").val(), "id_name" : $("#text-id_name").val(),
"id_group" : $("select#id_group").val(), "id_group" : $("#id_group_filter").val(),
"event_type" : $("#event_type").val(), "event_type" : $("#event_type").val(),
"severity" : $("#severity").val(), "severity" : $("#severity").val(),
"status" : $("#status").val(), "status" : $("#status").val(),
@ -900,7 +900,7 @@ function save_new_filter() {
"tag_without": Base64.decode($("#hidden-tag_without").val()), "tag_without": Base64.decode($("#hidden-tag_without").val()),
"filter_only_alert" : $("#filter_only_alert").val(), "filter_only_alert" : $("#filter_only_alert").val(),
"search_secondary_groups" : $("#checkbox-search_secondary_groups").val(), "search_secondary_groups" : $("#checkbox-search_secondary_groups").val(),
"id_group_filter": $("#id_group_filter").val(), "id_group_filter": $("#id_group_filter_dialog").val(),
"date_from": $("#text-date_from").val(), "date_from": $("#text-date_from").val(),
"time_from": $("#text-time_from").val(), "time_from": $("#text-time_from").val(),
"date_to": $("#text-date_to").val(), "date_to": $("#text-date_to").val(),
@ -960,7 +960,7 @@ function save_update_filter() {
{"page" : "include/ajax/events", {"page" : "include/ajax/events",
"update_event_filter" : 1, "update_event_filter" : 1,
"id" : $("#overwrite_filter").val(), "id" : $("#overwrite_filter").val(),
"id_group" : $("select#id_group").val(), "id_group" : $("#id_group_filter").val(),
"event_type" : $("#event_type").val(), "event_type" : $("#event_type").val(),
"severity" : $("#severity").val(), "severity" : $("#severity").val(),
"status" : $("#status").val(), "status" : $("#status").val(),
@ -976,7 +976,7 @@ function save_update_filter() {
"tag_without" : Base64.decode($("#hidden-tag_without").val()), "tag_without" : Base64.decode($("#hidden-tag_without").val()),
"filter_only_alert" : $("#filter_only_alert").val(), "filter_only_alert" : $("#filter_only_alert").val(),
"search_secondary_groups" : $("#checkbox-search_secondary_groups").val(), "search_secondary_groups" : $("#checkbox-search_secondary_groups").val(),
"id_group_filter": $("#id_group_filter").val(), "id_group_filter": $("#id_group_filter_dialog").val(),
"date_from": $("#text-date_from").val(), "date_from": $("#text-date_from").val(),
"time_from": $("#text-time_from").val(), "time_from": $("#text-time_from").val(),
"date_to": $("#text-date_to").val(), "date_to": $("#text-date_to").val(),

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

@ -175,7 +175,7 @@ $search_secondary_groups = get_parameter(
); );
$id_group_filter = get_parameter( $id_group_filter = get_parameter(
'filter[id_group_filter]', 'filter[id_group_filter]',
($filter['id_group_filter'] ?? '') ($filter['id_group'] ?? '')
); );
$date_from = get_parameter( $date_from = get_parameter(
'filter[date_from]', 'filter[date_from]',
@ -1558,8 +1558,8 @@ if (enterprise_hook(
*/ */
// Group. // Group.
if ($id_group_filter === null) { if ($id_group === null) {
$id_group_filter = 0; $id_group = 0;
} }
$data = html_print_input( $data = html_print_input(
@ -1568,7 +1568,7 @@ $data = html_print_input(
'returnAllGroup' => true, 'returnAllGroup' => true,
'privilege' => 'AR', 'privilege' => 'AR',
'type' => 'select_groups', 'type' => 'select_groups',
'selected' => $id_group_filter, 'selected' => $id_group,
'nothing' => false, 'nothing' => false,
'return' => true, 'return' => true,
'size' => '80%', 'size' => '80%',

2
pandora_console/operation/users/user_edit.php
View File

@ -446,7 +446,7 @@ if (isset($double_authentication)) {
if (check_acl($config['id_user'], 0, 'ER')) { if (check_acl($config['id_user'], 0, 'ER')) {
$event_filter = '<div class="label_select"><p class="edit_user_labels">'.__('Event filter').'</p>'; $event_filter = '<div class="label_select"><p class="edit_user_labels">'.__('Event filter').'</p>';
$user_groups = implode(',', array_keys((users_get_groups($config['id_user'], 'AR', $display_all_group)))); $user_groups = implode(',', array_keys((users_get_groups($config['id_user'], 'AR', true))));
$event_filter .= html_print_select_from_sql( $event_filter .= html_print_select_from_sql(
'SELECT id_filter, id_name FROM tevent_filter WHERE id_group_filter IN ('.$user_groups.')', 'SELECT id_filter, id_name FROM tevent_filter WHERE id_group_filter IN ('.$user_groups.')',
'event_filter', 'event_filter',