fixed several issues in item module graph of visual consoles
This commit is contained in:
parent
1328b2055c
commit
a484fb2408
|
@ -735,7 +735,7 @@ function grafico_modulo_sparse($params)
|
|||
$params['backgroundColor'] = 'white';
|
||||
}
|
||||
|
||||
if (isset($params['only_image']) === true) {
|
||||
if (isset($params['only_image']) === true && $params['vconsole'] !== true) {
|
||||
$params['backgroundColor'] = 'transparent';
|
||||
}
|
||||
|
||||
|
|
|
@ -170,7 +170,7 @@ function flot_area_graph(
|
|||
|
||||
// Set some containers to legend, graph, timestamp tooltip, etc.
|
||||
if ($params['show_legend']) {
|
||||
$return .= '<p id="legend_'.$graph_id.'" style="text-align:left; width: '.$params['width'].'px;"></p>';
|
||||
$return .= '<p id="legend_'.$graph_id.'" class="legend_background" style="text-align:left; width: '.$params['width'].'px;"></p>';
|
||||
}
|
||||
|
||||
if (isset($params['graph_combined']) === true && $params['graph_combined']
|
||||
|
|
|
@ -1517,6 +1517,20 @@ class Item extends CachedModel
|
|||
$result['border_color'] = $border_color;
|
||||
}
|
||||
|
||||
$id_custom_graph = static::parseIntOr(
|
||||
static::issetInArray(
|
||||
$data,
|
||||
[
|
||||
'customGraphId',
|
||||
'id_custom_graph',
|
||||
]
|
||||
),
|
||||
null
|
||||
);
|
||||
if ($id_custom_graph !== null) {
|
||||
$result['id_custom_graph'] = $id_custom_graph;
|
||||
}
|
||||
|
||||
$linked_layout_node_id = static::parseIntOr(
|
||||
static::issetInArray(
|
||||
$data,
|
||||
|
|
|
@ -356,10 +356,15 @@ class View extends \HTML
|
|||
|
||||
case MODULE_GRAPH:
|
||||
$data['backgroundType'] = \get_parameter('backgroundType');
|
||||
$type = \get_parameter('choosetype');
|
||||
$data['agentId'] = \get_parameter('agentId');
|
||||
$data['metaconsoleId'] = \get_parameter('metaconsoleId');
|
||||
$data['moduleId'] = \get_parameter('moduleId');
|
||||
$data['customGraphId'] = \get_parameter('customGraphId');
|
||||
if ($type === 'module') {
|
||||
$data['customGraphId'] = 0;
|
||||
}
|
||||
|
||||
$data['graphType'] = \get_parameter('graphType');
|
||||
$data['showLegend'] = \get_parameter_switch('showLegend');
|
||||
$data['period'] = \get_parameter('period');
|
||||
|
|
|
@ -398,7 +398,7 @@ table#diagnostic_info tbody td div {
|
|||
}
|
||||
.ui-widget-content,
|
||||
.ui-widget-content a {
|
||||
color: #fff;
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
.ui-widget-content.ui-autocomplete a {
|
||||
|
@ -1159,3 +1159,8 @@ a.pandora_pagination,
|
|||
padding-right: 35px;
|
||||
background-color: #222;
|
||||
}
|
||||
|
||||
.legend_background {
|
||||
background-color: #222;
|
||||
color: #fff !important;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue