diff --git a/pandora_console/extras/mr/56.sql b/pandora_console/extras/mr/56.sql new file mode 100644 index 0000000000..552928b4ac --- /dev/null +++ b/pandora_console/extras/mr/56.sql @@ -0,0 +1,5 @@ +START TRANSACTION; + +ALTER TABLE `tusuario` DROP COLUMN `metaconsole_assigned_server`; + +COMMIT; diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 669bdf4fdf..32b1e1b57b 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -301,7 +301,6 @@ if ($new_user && $config['admin_can_add_user']) { if (enterprise_installed() && is_metaconsole() === true) { $user_info['metaconsole_agents_manager'] = 0; - $user_info['metaconsole_assigned_server'] = ''; $user_info['metaconsole_access_node'] = 0; } @@ -375,7 +374,6 @@ if ($create_user) { if (defined('METACONSOLE')) { $values['metaconsole_access'] = get_parameter('metaconsole_access', 'basic'); $values['metaconsole_agents_manager'] = ($user_is_admin == 1 ? 1 : get_parameter('metaconsole_agents_manager', '0')); - $values['metaconsole_assigned_server'] = get_parameter('metaconsole_assigned_server', ''); $values['metaconsole_access_node'] = ($user_is_admin == 1 ? 1 : get_parameter('metaconsole_access_node', '0')); } } @@ -588,7 +586,6 @@ if ($update_user) { if (enterprise_installed() && defined('METACONSOLE')) { $values['metaconsole_access'] = get_parameter('metaconsole_access'); $values['metaconsole_agents_manager'] = get_parameter('metaconsole_agents_manager', '0'); - $values['metaconsole_assigned_server'] = get_parameter('metaconsole_assigned_server', ''); $values['metaconsole_access_node'] = get_parameter('metaconsole_access_node', '0'); } @@ -1373,15 +1370,6 @@ if ($meta) { true ).''; - $metaconsole_assigned_server = '

'.__('Assigned node').ui_print_help_tip(__('Server where the agents created of this user will be placed'), true).'

'; - $servers = metaconsole_get_servers(); - $servers_for_select = []; - foreach ($servers as $server) { - $servers_for_select[$server['id']] = $server['server_name']; - } - - $metaconsole_assigned_server .= html_print_select($servers_for_select, 'metaconsole_assigned_server', $user_info['metaconsole_assigned_server'], '', '', -1, true, false, false).'
'; - $metaconsole_access_node = '

'.__('Enable node access').ui_print_help_tip(__('With this option enabled, the user will can access to nodes console'), true).'

'; $metaconsole_access_node .= html_print_checkbox( 'metaconsole_access_node', @@ -1432,7 +1420,7 @@ if (!is_metaconsole()) { '.$area_data_timezone_polys.$area_data_timezone_rects.'
'; } else { - echo $search_custom_fields_view.$metaconsole_agents_manager.$metaconsole_assigned_server.$metaconsole_access_node; + echo $search_custom_fields_view.$metaconsole_agents_manager.$metaconsole_access_node; } echo ' @@ -1548,35 +1536,23 @@ $(document).ready (function () { } else { show_double_auth_deactivation(); } - }); + }); $('input:radio[name="is_admin"]').change(function() { - if($('#radiobtn0002').prop('checked')) { + if($('#radiobtn0002').prop('checked')) { $('#metaconsole_agents_manager_div').show(); $('#metaconsole_access_node_div').show(); - if($('#checkbox-metaconsole_agents_manager').prop('checked')) { - $('#metaconsole_assigned_server_div').show(); - } - } - else { - $('#metaconsole_agents_manager_div').hide(); - $('#metaconsole_access_node_div').hide(); - $('#metaconsole_assigned_server_div').hide(); - } - }); - - $('#checkbox-metaconsole_agents_manager').change(function() { - if($('#checkbox-metaconsole_agents_manager').prop('checked')) { - $('#metaconsole_assigned_server_div').show(); } else { - $('#metaconsole_assigned_server_div').hide(); + $('#metaconsole_agents_manager_div').hide(); + $('#metaconsole_access_node_div').hide(); } }); - + + $('input:radio[name="is_admin"]').trigger('change'); $('#checkbox-metaconsole_agents_manager').trigger('change'); - + show_data_section(); $('#checkbox-ehorus_user_level_enabled').change(function () { switch_ehorus_conf(); diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index ebd940c749..55217e2dc3 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1290,7 +1290,6 @@ CREATE TABLE IF NOT EXISTS `tusuario` ( `not_login` TINYINT UNSIGNED NOT NULL DEFAULT 0, `local_user` TINYINT UNSIGNED NOT NULL DEFAULT 0, `metaconsole_agents_manager` TINYINT UNSIGNED NOT NULL DEFAULT 0, - `metaconsole_assigned_server` INT UNSIGNED NOT NULL DEFAULT 0, `metaconsole_access_node` TINYINT UNSIGNED NOT NULL DEFAULT 0, `strict_acl` TINYINT UNSIGNED NOT NULL DEFAULT 0, `id_filter` INT UNSIGNED NULL DEFAULT NULL,