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

Merge branch 'ent-12371-no-se-ven-los-eventos-en-la-vista-de-agentes-si-no-eres-admin-global' into 'develop' 

Ent 12371 no se ven los eventos en la vista de agentes si no eres admin global

See merge request artica/pandorafms!6619
This commit is contained in:
Rafael Ameijeiras 2023-11-02 16:53:09 +00:00
parent c9149d04d9 287b983ce9
commit 0b932ac03c
4 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/images/alert_recovered@svg.svg Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / alert@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-alert" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M10,20 C11.4190985,20 12.5702076,18.8808594 12.5702076,17.5 L7.42979244,17.5 C7.42979244,18.8808594 8.5809015,20 10,20 Z M18.6540098,14.1519531 C17.8777645,13.3410156 16.425318,12.1210937 16.425318,8.125 C16.425318,5.08984375 14.2364028,2.66015625 11.2849029,2.0640625 L11.2849029,1.25 C11.2849029,0.559765625 10.7095493,0 10,0 C9.29045075,0 8.71509711,0.559765625 8.71509711,1.25 L8.71509711,2.0640625 C5.76359722,2.66015625 3.57468198,5.08984375 3.57468198,8.125 C3.57468198,12.1210938 2.12223547,13.3410156 1.3459902,14.1519531 C1.10492023,14.4039062 0.998045886,14.7050781 1.00002702,15 C1.00447442,15.640625 1.52156948,16.25 2.28977909,16.25 L17.7102209,16.25 C18.4784305,16.25 18.9959274,15.640625 18.999973,15 C19.0019541,14.7050781 18.8950798,14.4035156 18.6540098,14.1519531 L18.6540098,14.1519531 Z" id="Shape" fill="#82b92e"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

@ -2065,14 +2065,6 @@ if ($table_events) {
// (propagate ACL funct!).
$groups = users_get_groups($config['id_user']);
$tags_condition = tags_get_acl_tags(
$config['id_user'],
array_keys($groups),
'ER',
'event_condition',
'AND'
);
$tableEvents24h = new stdClass();
$tableEvents24h->class = 'filter_table';
$tableEvents24h->styleTable = 'border: 0;padding: 0;margin: 0 0 10px;';
@ -2107,7 +2099,7 @@ if ($table_events) {
);
} else {
events_print_event_table(
'estado <> 1 '.$tags_condition,
'estado <> 1',
200,
'100%',
false,

6
pandora_console/include/functions_events.php
View File

@ -2593,7 +2593,7 @@ function events_print_type_img(
switch ($type) {
case 'alert_recovered':
$style .= ' alert_module_background_state icon_background_normal ';
$icon = 'images/alert_recovered@svg.svg';
break;
case 'alert_manual_validation':
@ -2609,20 +2609,16 @@ function events_print_type_img(
case 'going_up_normal':
case 'going_down_normal':
// This is to be backwards compatible.
// $style .= ' event_module_background_state icon_background_normal';
$icon = 'images/module_ok.png';
break;
case 'going_up_warning':
$icon = 'images/module_warning.png';
// $style .= ' event_module_background_state icon_background_warning';
case 'going_down_warning':
$icon = 'images/module_warning.png';
// $style .= ' event_module_background_state icon_background_warning';
break;
case 'going_unknown':
// $style .= ' event_module_background_state icon_background_unknown';
$icon = 'images/module_unknown.png';
break;

31
pandora_console/include/styles/events.css
View File

@ -470,37 +470,6 @@ div.multi-response-buttons {
margin-bottom: 5px;
}
/*
.main_menu_icon_event {
height: 20px;
}
*/
.event_module_background_state {
mask: url(../../images/modules@svg.svg) no-repeat center / contain;
-webkit-mask: url(../../images/modules@svg.svg) no-repeat center / contain;
}
.alert_module_background_state {
mask: url(../../images/alert@svg.svg) no-repeat center / contain;
-webkit-mask: url(../../images/alert@svg.svg) no-repeat center / contain;
}
.icon_background_critical {
background-color: #e63c52;
}
.icon_background_warning {
background-color: #fcab10;
}
.icon_background_normal {
background-color: #82b92e;
}
.icon_background_unknown {
background-color: gray;
}
.events-refr {
width: 300px;
display: flex;