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

Add style css to image and fixed problems in metaconsole when grouped by agents in events. Internal ticket: #3079

Browse Source 
(cherry picked from commit 02388ff31f598a316c9c0a09852705d5f4f3411c)
This commit is contained in:
m-lopez-f 2016-09-01 10:50:34 +02:00
parent eb8e730f32
commit fb4a1b263a
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_events.php
View File

@ -2962,7 +2962,7 @@ function events_get_events_grouped_by_agent($sql_post, $offset = 0,
$table = events_get_events_table($meta, $history); $table = events_get_events_table($meta, $history);
if ($meta) { if ($meta) {
$fields_extra = ', agent_name'; $fields_extra = ', agent_name, server_id';
$groupby_extra = ', server_id'; $groupby_extra = ', server_id';
} }
else { else {
@ -3022,7 +3022,7 @@ function events_get_events_grouped_by_agent($sql_post, $offset = 0,
$id_agente = $event['agent_name']; $id_agente = $event['agent_name'];
$result[] = array('total' => $event['total'], $result[] = array('total' => $event['total'],
'id_server' => $event['id_server'], 'id_server' => $event['server_id'],
'id_agent' => $id_agente, 'id_agent' => $id_agente,
'event_type' => $resultado['event_type']); 'event_type' => $resultado['event_type']);
} }

7
pandora_console/include/javascript/pandora_events.js
View File

@ -491,8 +491,9 @@ function event_comment() {
//Show event list when fielter repetead is Group agents //Show event list when fielter repetead is Group agents
function show_events_group_agent (id_insert, id_agent, server_id) { function show_events_group_agent (id_insert, id_agent, server_id) {
parameter = [];
var ajax_file = $('#hidden-ajax_file').val();
parameter = [];
parameter.push ({name: "id_agent", parameter.push ({name: "id_agent",
value: id_agent}); value: id_agent});
parameter.push ({name: "server_id", parameter.push ({name: "server_id",
@ -522,7 +523,7 @@ function show_events_group_agent (id_insert, id_agent, server_id) {
parameter.push ({name: "date_to", parameter.push ({name: "date_to",
value: $("#text-date_to").val()}); value: $("#text-date_to").val()});
parameter.push ({name: "server_id_search", parameter.push ({name: "server_id_search",
value: $("#text-date_to").val()}); value: $("#server_id").val()});
parameter.push ({ parameter.push ({
name: "page", name: "page",
value: "include/ajax/events"}); value: "include/ajax/events"});
@ -532,7 +533,7 @@ function show_events_group_agent (id_insert, id_agent, server_id) {
jQuery.ajax ({ jQuery.ajax ({
type: 'POST', type: 'POST',
url: 'ajax.php', url: action=ajax_file,
data: parameter, data: parameter,
dataType: 'html', dataType: 'html',
success: function (data) { success: function (data) {

5
pandora_console/include/styles/pandora.css
View File

@ -3179,3 +3179,8 @@ div#vc-controls img.vc-qr {
display: none; display: none;
} }
/* jQuery dialog */ /* jQuery dialog */
/* Image open dialog in group events by agents*/
#open_agent_groups {
cursor: pointer;
}

2
pandora_console/operation/events/events.build_table.php
View File

@ -93,7 +93,7 @@ if ($group_rep == 2) {
$uniq = uniqid(); $uniq = uniqid();
if ($meta) { if ($meta) {
$table->data[$key][2] = '<img id="open_agent_groups" src=images/zoom_mc.png data-id="'.$table->id.'-'.$uniq.'-0" data-open="false" $table->data[$key][2] = '<img id="open_agent_groups" src=images/zoom_mc.png data-id="'.$table->id.'-'.$uniq.'-0" data-open="false"
onclick=\'show_events_group_agent("'.$uniq.'",'.$res['id_agent'].','.$res['id_server'].');\' />'; onclick=\'show_events_group_agent("'.$table->id.'-'.$uniq.'-0","'.$res['id_agent'].'",'.$res['id_server'].');\' />';
} }
else { else {
$table->data[$key][2] = '<img id="open_agent_groups" src="images/zoom_mc.png" data-id="'.$table->id.'-'.$uniq.'-0" data-open="false" $table->data[$key][2] = '<img id="open_agent_groups" src="images/zoom_mc.png" data-id="'.$table->id.'-'.$uniq.'-0" data-open="false"