tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New maps in progress... (Fixed error in nodes dialog)

This commit is contained in:
Arturo Gonzalez 2016-04-06 10:17:11 +02:00
parent 350f653d47
commit 725a4925a7
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/include/ajax/map.ajax.php
View File

@ -267,7 +267,7 @@ if (is_ajax ()) {
$table->head['type'] = __('Agent');
}
else {
$node_name = db_get_all_rows_sql("SELECT nombre
$node_name = db_get_all_rows_sql("SELECT nombre
FROM tagente_modulo
WHERE id_agente_modulo = " . $id_node_data);
$node_name = $node_name[0];
@ -281,15 +281,10 @@ if (is_ajax ()) {
$table->data = array();
$table->data[0][0] = __('Label');
$table->data[0][1] = $node_style;
$table->data[1][0] = __('Image');
$table->data[1][1] = $node_style['image'];
$table->data[2][0] = __('Width');
$table->data[2][1] = $node_style['width'];
$table->data[3][0] = __('Height');
$table->data[3][1] = $node_style['height'];
$table->data[4][0] = __('Shape');
$table->data[4][1] = html_print_select(array(
$table->data[0][1] = html_print_input_text('label',
$node_style['label'], '', 5, 10, true);
$table->data[3][0] = __('Shape');
$table->data[3][1] = html_print_select(array(
'circle' => __('Circle'),
'square' => __('Square'),
'rhombus' => __('Rhombus')), 'shape', '',

12
pandora_console/include/javascript/map/MapController.js
View File

@ -2399,10 +2399,14 @@ MapController.prototype.editNode = function(self, target) {
type: "POST",
url: "ajax.php",
success: function (data) {
$(target).append("<div id='edit_node_dialog' style='display: none;'></div>");
$("#edit_node_dialog").append(data);
$("#edit_node_dialog").dialog({ autoOpen: false });
$("#edit_node_dialog").dialog("open");
$(target).append("<div id='edit_node_dialog_" + node_id + "' style='display: none;'></div>");
$("#edit_node_dialog_" + node_id).append(data);
$("#edit_node_dialog_" + node_id).dialog({
autoOpen: false,
closeOnEscape: true
});
$("#edit_node_dialog_" + node_id).dialog("open");
}
});
}