diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 4e31057a89..22bcc52766 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1150,10 +1150,10 @@ ALTER TABLE titem MODIFY `source_data` int(10) unsigned; INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30'); -INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 4); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 7); UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise'; -INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '708'); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '714'); -- --------------------------------------------------------------------- -- Table `tplanned_downtime_agents` diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 0f3ce0cb57..ef2e4f0f9c 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -565,7 +565,7 @@ $values = array ( 'Tactical view'=>__('Tactical view'), 'Alert detail' => __('Alert detail'), 'Other'=>__('Other')); -if (enterprise_installed()) { +if (enterprise_installed() && !is_metaconsole()) { $values['Dashboard'] = __('Dashboard'); } $table->data[12][1] = html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false); diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index ed5141cc47..f82a22d4c1 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -1175,7 +1175,16 @@ function visual_map_print_item($mode = "read", $layoutData, if ($link) { echo ""; } - + + //for clean link text from bbdd + if (get_parameter('action') == 'edit' || get_parameter('operation') == 'edit_visualmap') { + $aux_text1 = explode("", $aux_text1[1]); + $aux_text3 = explode("", $aux_text2[1]); + + $text = $aux_text1[0].$aux_text3[0].$aux_text3[1]; + } + switch ($type) { case BOX_ITEM: if ($width == 0 || $width == 0) { @@ -1650,13 +1659,6 @@ function visual_map_print_item($mode = "read", $layoutData, } break; case LABEL: - if (get_parameter('action') == 'edit' || get_parameter('operation') == 'edit_visualmap') { - $aux_text1 = explode("", $aux_text1[1]); - $aux_text3 = explode("", $aux_text2[1]); - - $text = $aux_text1[0].$aux_text3[0].$aux_text3[1]; - } echo io_safe_output($text); break; case ICON: diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php index 10732896ec..7769f4d3e2 100755 --- a/pandora_console/include/functions_visual_map_editor.php +++ b/pandora_console/include/functions_visual_map_editor.php @@ -556,7 +556,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { ''; $form_items_advance['map_linked_row'] = array(); - $form_items_advance['map_linked_row']['items'] = array('static_graph', 'label'); + $form_items_advance['map_linked_row']['items'] = array('static_graph', 'label', 'icon'); $form_items_advance['map_linked_row']['html'] = ''. __('Map linked') . ui_print_help_tip ( __("If a parent visual console is selected here, an agent or module cannot be selected and will be removed if a previous selection was done."), true) .