mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-31 01:35:36 +02:00
Merge branch 'ent-11194-snmp-no-se-puede-definir-en-graficas-en-tiempo-real' into 'develop'
Ent 11194 snmp no se puede definir en graficas en tiempo real See merge request artica/pandorafms!5899
This commit is contained in:
commit
a3c7bdb655
@ -186,10 +186,6 @@ function pandora_realtime_graphs()
|
|||||||
|
|
||||||
$table->data[] = $data;
|
$table->data[] = $data;
|
||||||
|
|
||||||
if ($graph == 'snmp_interface' || $graph == 'snmp_module') {
|
|
||||||
echo snmp_browser_print_container(true, '100%', '60%', 'none');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Print the relative path to AJAX calls.
|
// Print the relative path to AJAX calls.
|
||||||
html_print_input_hidden('rel_path', get_parameter('rel_path', ''));
|
html_print_input_hidden('rel_path', get_parameter('rel_path', ''));
|
||||||
|
|
||||||
@ -224,7 +220,7 @@ function pandora_realtime_graphs()
|
|||||||
false,
|
false,
|
||||||
'',
|
'',
|
||||||
'white-box-content',
|
'white-box-content',
|
||||||
'box-flat white_table_graph'
|
'box-flat white_table_graph fixed_filter_bar'
|
||||||
);
|
);
|
||||||
|
|
||||||
$chart[time()]['graph'] = '0';
|
$chart[time()]['graph'] = '0';
|
||||||
@ -266,6 +262,16 @@ function pandora_realtime_graphs()
|
|||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if ($graph == 'snmp_interface' || $graph == 'snmp_module') {
|
||||||
|
html_print_div(
|
||||||
|
[
|
||||||
|
'class' => 'white_box',
|
||||||
|
'id' => 'graph_snmp_interface',
|
||||||
|
'content' => snmp_browser_print_container(true, '100%', '60%', '', false, false),
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// echo $canvas;
|
// echo $canvas;
|
||||||
// Define a custom action to save
|
// Define a custom action to save
|
||||||
// the OID selected in the SNMP browser to the form.
|
// the OID selected in the SNMP browser to the form.
|
||||||
|
@ -1122,7 +1122,7 @@ function snmp_browser_print_container(
|
|||||||
|
|
||||||
if ($toggle === false) {
|
if ($toggle === false) {
|
||||||
// This extra div that can be handled by jquery's dialog.
|
// This extra div that can be handled by jquery's dialog.
|
||||||
$output .= '<div id="snmp_browser_container" style="display:none">';
|
$output .= '<div id="snmp_browser_container" style="'.$display.'">';
|
||||||
$output .= '<div style="text-align: left; width: '.$width.'; height: '.$height.';">';
|
$output .= '<div style="text-align: left; width: '.$width.'; height: '.$height.';">';
|
||||||
$output .= '<div class="w100p">';
|
$output .= '<div class="w100p">';
|
||||||
$output .= '<form onsubmit="snmpBrowse(); return false;">';
|
$output .= '<form onsubmit="snmpBrowse(); return false;">';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user