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

Merge branch 'develop' into ent-12052-filtro-de-vista-alert-details-no-muestra-las-alertas-de-los-agentes-que-tienen-grupo

This commit is contained in:
miguel angel rasteu 2023-12-01 10:27:23 +01:00
parent 5ee6eb7306 d8063fd008
commit f847de7437
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/alerts/alert_view.php
View File

@ -256,7 +256,7 @@ $schedule = io_safe_output(
$data[0] = ''; $data[0] = '';
$data[0] .= html_print_input_hidden('schedule', $schedule, true); $data[0] .= html_print_input_hidden('schedule', $schedule, true);
$data[0] .= '<div id="calendar_map"></div>'; $data[0] .= '<div id="calendar_map" class="alert_view_calendar"></div>';
$data[1] = ''; $data[1] = '';
$table_conditions->data[] = $data; $table_conditions->data[] = $data;

5
pandora_console/godmode/reporting/visual_console_builder.php
View File

@ -163,7 +163,10 @@ switch ($activeTab) {
$background_color = (string) get_parameter('background_color'); $background_color = (string) get_parameter('background_color');
$width = (int) get_parameter('width'); $width = (int) get_parameter('width');
$height = (int) get_parameter('height'); $height = (int) get_parameter('height');
$visualConsoleName = (string) io_safe_input(get_parameter('name')); $visualConsoleName = (string) get_parameter('name');
$visualConsoleName = str_replace('&lt;', '', $visualConsoleName);
$visualConsoleName = str_replace('&gt;', '', $visualConsoleName);
$visualConsoleName = (string) io_safe_input($visualConsoleName);
$is_favourite = (int) get_parameter('is_favourite_sent'); $is_favourite = (int) get_parameter('is_favourite_sent');
$auto_adjust = (int) get_parameter('auto_adjust_sent'); $auto_adjust = (int) get_parameter('auto_adjust_sent');

11
pandora_console/include/functions_events.php
View File

@ -2617,7 +2617,6 @@ function events_print_type_img(
$urlImage = ui_get_full_url(false); $urlImage = ui_get_full_url(false);
$icon = ''; $icon = '';
$style = 'main_menu_icon'; $style = 'main_menu_icon';
switch ($type) { switch ($type) {
case 'alert_recovered': case 'alert_recovered':
$icon = 'images/alert_recovered@svg.svg'; $icon = 'images/alert_recovered@svg.svg';
@ -2683,16 +2682,6 @@ function events_print_type_img(
if ($only_url) { if ($only_url) {
$output = $urlImage.'/'.$icon; $output = $urlImage.'/'.$icon;
} else { } else {
/*
$output .= html_print_div(
[
'title' => events_print_type_description($type, true),
'class' => $style,
'style' => ((empty($icon) === false) ? 'background-image: url('.$icon.'); background-repeat: no-repeat;' : ''),
],
true
);
*/
$output .= html_print_image( $output .= html_print_image(
$icon, $icon,
true, true,

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

@ -12788,6 +12788,10 @@ div.agents_custom_fields #datatables_wrapper div.bottom {
justify-content: flex-start !important; justify-content: flex-start !important;
} }
.alert_view_calendar > .fc-view-harness > .fc-view > .fc-scrollgrid {
width: auto !important;
}
.title_tactical { .title_tactical {
padding: 10px 0px 10px 0px; padding: 10px 0px 10px 0px;
text-align: center; text-align: center;