tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed lines in visual console

Browse Source
This commit is contained in:
Arturo Gonzalez 2017-05-09 12:40:22 +02:00
parent ce179c39aa
commit eb1dafe807
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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(); metaconsole = $("input[name='metaconsole']").val();
var parameter = Array(); var parameter = Array();
parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"}); parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
parameter.push ({name: "action", value: "get_color_line"}); 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, "node_end": id_data,
"color": color }; "color": color };
lines.push(line); lines.push(line);
refresh_lines(lines, 'background', true); refresh_lines(lines, 'background', true);
@ -2250,7 +2247,7 @@ function createItem(type, values, id_data) {
lines.push(line); 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); 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 (typeof(values['parent']) != 'undefined' && values['parent'] > 0 ) {
if (!found) { 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); refresh_lines(lines, 'background', true);
break; break;
} }
refresh_lines(lines, 'background', true); refresh_lines(lines, 'background', true);
draw_user_lines("", 0, 0, 0 , 0, 0, true); draw_user_lines("", 0, 0, 0 , 0, 0, true);
} }
@ -2601,9 +2599,19 @@ function updateDB(type, idElement , values, event) {
url: get_url_ajax(), url: get_url_ajax(),
data: parameter, data: parameter,
type: "POST", type: "POST",
dataType: 'text', dataType: 'json',
success: function (data) { 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);
}
} }
}); });
} }

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

@ -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, $result = db_process_sql_update('tlayout_data', $values,
array('id' => $id_element)); 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;
} }
break; break;

1
pandora_console/include/javascript/pandora_visual_console.js
View File

@ -17,7 +17,6 @@
* @param editor Boolean variable to set other css selector in editor (when true). * @param editor Boolean variable to set other css selector in editor (when true).
*/ */
function draw_line (line, id_div) { function draw_line (line, id_div) {
selector = ''; selector = '';
//Check if the global var resize_map is defined //Check if the global var resize_map is defined