tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed errors cv

Browse Source
This commit is contained in:
daniel 2018-11-14 16:38:44 +01:00
parent 22a26aa072
commit 60212dae50
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/reporting/visual_console_builder.data.php
View File

@ -195,10 +195,10 @@ html_print_submit_button ($textButtonSubmit, 'update_layout', false,
echo '</div>'; echo '</div>';
echo "</form>"; echo "</form>";
ui_require_css_file ("color-picker");
ui_require_jquery_file ("colorpicker");
?> ?>
<script src="include/javascript/jquery.colorpicker.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready (function () { $(document).ready (function () {

2
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -2616,7 +2616,7 @@ function setEventsBar(id_data, values) {
parameter.push ({name: "id_agent", value: values['id_agent']}); parameter.push ({name: "id_agent", value: values['id_agent']});
parameter.push ({name: "id_agent_module", value: values['module']}); parameter.push ({name: "id_agent_module", value: values['module']});
if (is_metaconsole()) { if (is_metaconsole()) {
parameter.push ({name: "id_metaconsole", value: id_metaconsole}); parameter.push ({name: "id_metaconsole", value: values['server_id']});
} }
parameter.push ({name: "period", value: values['event_max_time_row']}); parameter.push ({name: "period", value: values['event_max_time_row']});
parameter.push ({name: "id_visual_console", value: id_visual_console}); parameter.push ({name: "id_visual_console", value: id_visual_console});

27
pandora_console/include/ajax/visual_console_builder.ajax.php
View File

@ -328,8 +328,19 @@ switch ($action) {
case 'get_layout_data': case 'get_layout_data':
if(is_metaconsole()){
$server_data = metaconsole_get_connection_by_id($server_id);
// Establishes connection
if (metaconsole_load_external_db($server_data) !== NOERR) continue;
}
$layoutData = db_get_row_filter('tlayout_data', $layoutData = db_get_row_filter('tlayout_data',
array('id' => $id_element)); array('id' => $id_element));
if(is_metaconsole()){
metaconsole_restore_db();
}
$layoutData['height'] = $layoutData['height']; $layoutData['height'] = $layoutData['height'];
$layoutData['width'] = $layoutData['width']; $layoutData['width'] = $layoutData['width'];
echo json_encode($layoutData); echo json_encode($layoutData);
@ -726,6 +737,14 @@ switch ($action) {
if ($id_custom_graph !== null) { if ($id_custom_graph !== null) {
$values['id_custom_graph'] = $id_custom_graph; $values['id_custom_graph'] = $id_custom_graph;
} }
if(is_metaconsole()){
if($values['id_custom_graph'] != 0){
$explode_id = explode("|", $values['id_custom_graph']);
$values['id_custom_graph'] = $explode_id[0];
$values['id_metaconsole'] = $explode_id[1];
}
}
break; break;
case 'bars_graph': case 'bars_graph':
if ($width_percentile !== null) { if ($width_percentile !== null) {
@ -1208,9 +1227,11 @@ switch ($action) {
$values['type'] = MODULE_GRAPH; $values['type'] = MODULE_GRAPH;
if(is_metaconsole()){ if(is_metaconsole()){
$explode_id = explode("|", $values['id_custom_graph']); if($values['id_custom_graph'] != 0){
$values['id_custom_graph'] = $explode_id[0]; $explode_id = explode("|", $values['id_custom_graph']);
$values['id_metaconsole'] = $explode_id[1]; $values['id_custom_graph'] = $explode_id[0];
$values['id_metaconsole'] = $explode_id[1];
}
} }
if ($values['id_custom_graph'] > 0 ) { if ($values['id_custom_graph'] > 0 ) {