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

Merge branch 'ent-7370-modal-incorrecto-al-editar-el-nodo-de-un-cluster' into 'develop' 

fixed error with modal cluster view

See merge request artica/pandorafms!4057
This commit is contained in:
Daniel Rodriguez 2021-04-27 10:39:23 +00:00
parent d9a63c4682 733087f704
commit 4589e77bc8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/include/class/NetworkMap.class.php
View File

@ -2840,13 +2840,7 @@ class NetworkMap
*/
public function loadSimpleInterface()
{
$output = '<div id="open_version_dialog" class="invisible">';
$output .= __(
'In the Open version of %s can not be edited nodes or map',
get_product_name()
);
$output .= '</div>';
$output = '';
$output .= '<div id="dialog_node_edit" class="invisible" title="';
$output .= __('Edit node').'">';
$output .= '<div class="left w100p">';
@ -2896,6 +2890,12 @@ class NetworkMap
$id = 'dialog_node_edit';
if (!enterprise_installed()) {
$id = 'open_version_dialog';
$output = '<div id="open_version" style="display: none" title="'.__('Warning').'">';
$output .= '<div class="center mrgn_top_20px w90p font_13px">'.__(
'In the Open version of %s can not be edited nodes or map',
get_product_name()
);
$output .= '</div></div>';
}
$output .= '<div id="'.$id.'" class="invisible" title="';

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

@ -879,6 +879,7 @@ function edit_node(data_node, dblClick) {
); // It doesn't eval the possible XSS so it's ok
$("#dialog_node_edit").dialog("open");
$("#open_version_dialog").dialog();
$("#open_version").dialog();
if (node_selected.id_agent == undefined || node_selected.type == 3) {
//Fictional node