From: <gi...@ma...> - 2010-04-29 04:06:52
|
The branch, master has been updated via 101d87befda99950e7df8cabe2af5f1d4b7591be (commit) from 1c98587f1e5f6a43ab0134a20e8bb1ed39231d9b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 101d87befda99950e7df8cabe2af5f1d4b7591be Author: David Hicks <hic...@op...> Date: Thu Apr 29 14:02:16 2010 +1000 Fix #11862: Preselect user's current access level in dropdown On manage_user_edit_page.php the access level of a user is always preselected to be the default access level at which new user accounts are created. We should instead try to preselect the user's current access level from the list so that when the form is saved, the access level of the user isn't changed by accident. Also remove the fake [Default Access Level] option from the list as it serves little to no useful purpose. ----------------------------------------------------------------------- Summary of changes: core/print_api.php | 10 ---------- manage_user_edit_page.php | 8 +++++++- 2 files changed, 7 insertions(+), 11 deletions(-) ----------------------------------------------------------------------- commit 101d87befda99950e7df8cabe2af5f1d4b7591be Author: David Hicks <hic...@op...> Date: Thu Apr 29 14:02:16 2010 +1000 Fix #11862: Preselect user's current access level in dropdown On manage_user_edit_page.php the access level of a user is always preselected to be the default access level at which new user accounts are created. We should instead try to preselect the user's current access level from the list so that when the form is saved, the access level of the user isn't changed by accident. Also remove the fake [Default Access Level] option from the list as it serves little to no useful purpose. diff --git a/core/print_api.php b/core/print_api.php index ef47bc5..da81bb4 100644 --- a/core/print_api.php +++ b/core/print_api.php @@ -976,24 +976,14 @@ function print_project_user_option_list( $p_project_id = null ) { # logged in user. This is used when adding users to projects function print_project_access_levels_option_list( $p_val, $p_project_id = null ) { $t_current_user_access_level = access_get_project_level( $p_project_id ); - $t_access_levels_enum_string = config_get( 'access_levels_enum_string' ); - - # Add [default access level] to add the user to a project - # with his default access level. - echo '<option value="' . DEFAULT_ACCESS_LEVEL . '"'; - echo '>[' . lang_get( 'default_access_level' ) . ']</option>'; - $t_enum_values = MantisEnum::getValues( $t_access_levels_enum_string ); - foreach ( $t_enum_values as $t_enum_value ) { # a user must not be able to assign another user an access level that is higher than theirs. if ( $t_enum_value > $t_current_user_access_level ) { continue; } - $t_access_level = get_enum_element( 'access_levels', $t_enum_value ); - echo '<option value="' . $t_enum_value . '"'; check_selected( $p_val, $t_enum_value ); echo '>' . $t_access_level . '</option>'; diff --git a/manage_user_edit_page.php b/manage_user_edit_page.php index 69166d6..cfad869 100644 --- a/manage_user_edit_page.php +++ b/manage_user_edit_page.php @@ -149,7 +149,13 @@ print_manage_menu(); </td> <td> <select name="access_level"> - <?php print_project_access_levels_option_list( config_get( 'default_new_account_access_level' ) ) ?> + <?php + $t_access_level = $t_user['access_level']; + if ( !MantisEnum::hasValue( config_get( 'access_levels_enum_string' ), $t_access_level ) ) { + $t_access_level = config_get( 'default_new_account_access_level' ); + } + print_project_access_levels_option_list( $t_access_level ) + ?> </select> </td> </tr> ----------------------------------------------------------------------- -- Mantis Bug Tracker |