Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta

pandora_console/include/functions_events.php

@@ -1674,6 +1674,12 @@ function events_get_all(
         }
     }
 
+    if (!$user_is_admin && users_can_manage_group_all('ER') === false) {
+        if (str_contains($fields[0], 'te.id_grupo') === false) {
+            $fields[0] .= ', te.id_grupo';
+        }
+    }
+
     if (((int) $filter['group_rep'] === EVENT_GROUP_REP_EVENTS
         || (int) $filter['group_rep'] === EVENT_GROUP_REP_EXTRAIDS) && $count === false
     ) {

pandora_console/include/graphs/functions_flot.php

@@ -303,9 +303,15 @@ function flot_area_graph(
         }
     }
 
+    $extra_styles = '';
+    if (isset($params['extra_styles']) === true && empty($params['extra_styles']) === false) {
+        $extra_styles = $params['extra_styles'];
+    }
+
     $return .= 'graph'.$params['adapt_key']."'
 				style='".$width.';
-				height: '.$params['height']."px;'></div>";
+				height: '.$params['height'].'px;
+                '.$extra_styles."'></div>";
 
     $legend_top = 10;
     if (empty($params['show_legend']) === false) {

pandora_console/include/javascript/pandora.js

@@ -2407,7 +2407,9 @@ $(document).ready(function() {
         closeOnEscape: true,
         width: 700,
         height: 450,
-
+        close: function() {
+          closeAboutModal();
+        },
         create: function() {
           $("#about-tabs").tabs({});
           $(".ui-dialog-titlebar").remove();
@@ -2415,7 +2417,6 @@ $(document).ready(function() {
           $("#about-close").click(function() {
             $("#about-tabs").dialog("close");
             $("div.ui-dialog").remove();
-            $("#icon_about").removeClass("selected");
           });
         }
       });
@@ -2436,7 +2437,9 @@ $(document).ready(function() {
         closeOnEscape: true,
         width: 700,
         height: 450,
-
+        close: function() {
+          closeAboutModal();
+        },
         create: function() {
           $("#about-tabs").tabs({});
           $(".ui-dialog-titlebar").remove();
@@ -2444,7 +2447,6 @@ $(document).ready(function() {
           $("#about-close").click(function() {
             $("#about-tabs").dialog("close");
             $("div.ui-dialog").remove();
-            $("#icon_about_operation").removeClass("selected");
           });
         }
       });
@@ -2746,6 +2748,12 @@ function resizeSearchHeader() {
   }
 }
 
+function closeAboutModal() {
+  $("#icon_about_operation").removeClass("selected");
+  $("#icon_about").removeClass("selected");
+  $("#icon_about_div").removeClass("selected");
+}
+
 function redirectNode(url, target = "_blank") {
   if (
     typeof event !== "undefined" &&

pandora_console/include/lib/Dashboard/Widgets/BasicChart.php

@@ -641,12 +641,28 @@ class BasicChart extends Widget
             $this->values['period'] = parent::getPeriod();
         }
 
+        $margin = 15;
+        $size['height'] -= $margin;
+        $graph_height = $size['height'];
+        $margin_top = 0;
+        if ((bool) $this->values['showLabel'] === true) {
+            $margin_top = $this->values['sizeLabel'];
+        }
+
+        if ((bool) $this->values['showValue'] === true) {
+            if ($this->values['sizeValue'] > $this->values['sizeLabel']) {
+                $margin_top = $this->values['sizeValue'];
+            }
+        }
+
+        $graph_height -= $margin_top;
+
         $params = [
             'agent_module_id'    => $this->values['moduleId'],
             'period'             => $this->values['period'],
             'show_events'        => false,
             'width'              => '100%',
-            'height'             => $size['height'],
+            'height'             => $graph_height,
             'title'              => $module_name,
             'unit'               => $units_name,
             'only_image'         => false,
@@ -661,6 +677,7 @@ class BasicChart extends Widget
             'backgroundColor'    => 'transparent',
             // 'server_id'          => $metaconsoleId,
             'basic_chart'        => true,
+            'extra_styles'       => 'bottom: -'.($margin_top + $margin - 1).'px; margin-left: 0px;',
             'array_colors'       => [
                 [
                     'border' => '#000000',
@@ -671,7 +688,7 @@ class BasicChart extends Widget
         ];
 
         $graph = \grafico_modulo_sparse($params);
-        $output = '<div class="container-center widget-mrgn-0px">';
+        $output = '<div class="container-center widget-mrgn-0px w100pi basic-chart-widget">';
         if (str_contains($graph, '<img') === false) {
             $output .= '<div class="basic-chart-title">';
             $output .= '<span style="color:'.$this->values['colorLabel'].'; font-size:'.$this->values['sizeLabel'].'px;">';

pandora_console/include/styles/dashboards.css

@@ -1000,3 +1000,7 @@ input.resize_button {
 .grid-stack-item-content .visual-console-container-dashboard {
   text-align: initial;
 }
+
+ul.select2-selection__rendered > li.select2-selection__choice {
+  box-sizing: border-box !important;
+}

pandora_console/include/styles/pandora_black.css

@@ -2086,3 +2086,7 @@ li.agent-autocomplete-li-text-color a {
 select option:checked {
   background-color: var(--tertiary-color);
 }
+
+.basic-chart-widget .flot-base {
+  background-color: unset;
+}