From eb1dafe807d24600b47066019167733526113262 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Tue, 9 May 2017 12:40:22 +0200 Subject: [PATCH] Fixed lines in visual console --- .../visual_console_builder.editor.js | 24 ++++++++++++------- .../ajax/visual_console_builder.ajax.php | 12 +++++++++- .../javascript/pandora_visual_console.js | 1 - 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index 310286ae69..fbb168648e 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -1849,11 +1849,9 @@ function get_image_url(img_src) { }); } -function set_color_line_status(lines, line, id_data, values) { +function set_color_line_status(lines, id_data, values) { metaconsole = $("input[name='metaconsole']").val(); - - var parameter = Array(); parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"}); parameter.push ({name: "action", value: "get_color_line"}); @@ -1875,7 +1873,6 @@ function set_color_line_status(lines, line, id_data, values) { "node_end": id_data, "color": color }; - lines.push(line); refresh_lines(lines, 'background', true); @@ -2250,7 +2247,7 @@ function createItem(type, values, id_data) { lines.push(line); - set_color_line_status(lines, line, id_data, values); + set_color_line_status(lines, id_data, values); refresh_lines(lines, 'background', true); } @@ -2446,7 +2443,7 @@ function updateDB_visual(type, idElement , values, event, top, left) { if (typeof(values['parent']) != 'undefined' && values['parent'] > 0 ) { if (!found) { - set_color_line_status(lines, line, idElement, values); + set_color_line_status(lines, idElement, values); } } @@ -2465,6 +2462,7 @@ function updateDB_visual(type, idElement , values, event, top, left) { refresh_lines(lines, 'background', true); break; } + refresh_lines(lines, 'background', true); draw_user_lines("", 0, 0, 0 , 0, 0, true); } @@ -2601,9 +2599,19 @@ function updateDB(type, idElement , values, event) { url: get_url_ajax(), data: parameter, type: "POST", - dataType: 'text', + dataType: 'json', success: function (data) { - updateDB_visual(type, idElement , values, event, top, left); + if (data['correct']) { + if (data['new_line']) { + var line = {"id": idElement, + "node_begin": values['parent'], + "node_end": idElement, + "color": '#cccccc' }; + + lines.push(line); + } + updateDB_visual(type, idElement , values, event, top, left); + } } }); } diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index 74d99febd5..2a786200ad 100755 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -616,10 +616,20 @@ switch ($action) { } } + $item_in_db = db_get_row_filter ('tlayout_data', array ('id' => $id_element)); + + if (($item_in_db['parent_item'] == 0) && ($values['parent_item'] != 0)) { + $new_line = 1; + } + $result = db_process_sql_update('tlayout_data', $values, array('id' => $id_element)); - echo (int)$result; + $return_val = array(); + $return_val['correct'] = (int)$result; + $return_val['new_line'] = $new_line; + + echo json_encode($return_val); break; } break; diff --git a/pandora_console/include/javascript/pandora_visual_console.js b/pandora_console/include/javascript/pandora_visual_console.js index 2767a8105b..42d7f9aed1 100755 --- a/pandora_console/include/javascript/pandora_visual_console.js +++ b/pandora_console/include/javascript/pandora_visual_console.js @@ -17,7 +17,6 @@ * @param editor Boolean variable to set other css selector in editor (when true). */ function draw_line (line, id_div) { - selector = ''; //Check if the global var resize_map is defined