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:
Daniel Rodriguez 2021-10-05 09:19:26 +00:00
commit a794f30141
4 changed files with 1404 additions and 27 deletions

View File

@ -3032,6 +3032,7 @@ function erase_node($id)
['deleted' => 1],
['id_parent' => (int) $node['id']]
);
db_process_sql_update(
'trel_item',
['deleted' => 1],
@ -3045,6 +3046,7 @@ function erase_node($id)
'type' => 1,
]
);
foreach ($node_modules as $node_module) {
$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(
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
)
);

View File

@ -763,7 +763,6 @@ function move_to_networkmap(node) {
}
function edit_node(data_node, dblClick) {
console.log("PATATA");
var flag_edit_node = true;
var edit_node = null;

View File

@ -66,10 +66,7 @@ if ($new_networkmap) {
$disabled_generation_method_select = false;
$disabled_source = false;
if ($edit_networkmap) {
if (enterprise_installed()) {
$disabled_generation_method_select = true;
}
$disabled_generation_method_select = true;
$disabled_source = true;
$values = db_get_row('tmap', 'id', $id);

File diff suppressed because it is too large Load Diff