Merge branch 'ent-8060-bug-modal-networkmaps' into 'develop'
Fixed issue with node actions Closes pandora_enterprise#8060 See merge request artica/pandorafms!4438
This commit is contained in:
commit
a794f30141
|
@ -3032,6 +3032,7 @@ function erase_node($id)
|
||||||
['deleted' => 1],
|
['deleted' => 1],
|
||||||
['id_parent' => (int) $node['id']]
|
['id_parent' => (int) $node['id']]
|
||||||
);
|
);
|
||||||
|
|
||||||
db_process_sql_update(
|
db_process_sql_update(
|
||||||
'trel_item',
|
'trel_item',
|
||||||
['deleted' => 1],
|
['deleted' => 1],
|
||||||
|
@ -3045,6 +3046,7 @@ function erase_node($id)
|
||||||
'type' => 1,
|
'type' => 1,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach ($node_modules as $node_module) {
|
foreach ($node_modules as $node_module) {
|
||||||
$style = json_decode($node_module['style'], true);
|
$style = json_decode($node_module['style'], true);
|
||||||
|
|
||||||
|
@ -4035,7 +4037,8 @@ function add_agent_node_in_option($id_networkmap, $id_agent, $x, $y)
|
||||||
|
|
||||||
$new_node = db_get_row_sql(
|
$new_node = db_get_row_sql(
|
||||||
sprintf(
|
sprintf(
|
||||||
'SELECT * FROM titem WHERE id_map = $id_networkmap AND type = 0 AND source_data = %s',
|
'SELECT * FROM titem WHERE id_map = %s AND type = 0 AND source_data = %s',
|
||||||
|
$id_networkmap,
|
||||||
$id_agent
|
$id_agent
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
|
@ -763,7 +763,6 @@ function move_to_networkmap(node) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function edit_node(data_node, dblClick) {
|
function edit_node(data_node, dblClick) {
|
||||||
console.log("PATATA");
|
|
||||||
var flag_edit_node = true;
|
var flag_edit_node = true;
|
||||||
var edit_node = null;
|
var edit_node = null;
|
||||||
|
|
||||||
|
|
|
@ -66,10 +66,7 @@ if ($new_networkmap) {
|
||||||
$disabled_generation_method_select = false;
|
$disabled_generation_method_select = false;
|
||||||
$disabled_source = false;
|
$disabled_source = false;
|
||||||
if ($edit_networkmap) {
|
if ($edit_networkmap) {
|
||||||
if (enterprise_installed()) {
|
$disabled_generation_method_select = true;
|
||||||
$disabled_generation_method_select = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
$disabled_source = true;
|
$disabled_source = true;
|
||||||
|
|
||||||
$values = db_get_row('tmap', 'id', $id);
|
$values = db_get_row('tmap', 'id', $id);
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue