commit/galaxy-central: dannon: Remove prefilled password/confirm/current fields from edit user info.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/5f739cf9187b/ changeset: 5f739cf9187b user: dannon date: 2012-09-25 17:30:16 summary: Remove prefilled password/confirm/current fields from edit user info. affected #: 2 files diff -r e327eba84158eb62d0c5c76e77a62ae999fc3779 -r 5f739cf9187bde20a0b9d368bf83ffcac19eedc0 lib/galaxy/web/controllers/user.py --- a/lib/galaxy/web/controllers/user.py +++ b/lib/galaxy/web/controllers/user.py @@ -694,6 +694,7 @@ else: widgets = user_type_form_definition.get_widgets( None, contents={}, **kwd ) return widgets + @web.expose def manage_user_info( self, trans, cntrller, **kwd ): '''Manage a user's login, password, public username, type, addresses, etc.''' @@ -707,11 +708,6 @@ raise AssertionError, "The user id (%s) is not valid" % str( user_id ) webapp = get_webapp( trans, **kwd ) email = util.restore_text( params.get( 'email', user.email ) ) - # Do not sanitize passwords, so take from kwd - # instead of params ( which were sanitized ) - current = kwd.get( 'current', '' ) - password = kwd.get( 'password', '' ) - confirm = kwd.get( 'confirm', '' ) username = util.restore_text( params.get( 'username', '' ) ) if not username: username = user.username @@ -721,7 +717,7 @@ user_type_form_definition = self.__get_user_type_form_definition( trans, user=user, **kwd ) user_type_fd_id = params.get( 'user_type_fd_id', 'none' ) if user_type_fd_id == 'none' and user_type_form_definition is not None: - user_type_fd_id = trans.security.encode_id( user_type_form_definition.id ) + user_type_fd_id = trans.security.encode_id( user_type_form_definition.id ) user_type_fd_id_select_field = self.__build_user_type_fd_id_select_field( trans, selected_value=user_type_fd_id ) widgets = self.__get_widgets( trans, user_type_form_definition, user=user, **kwd ) # user's addresses @@ -739,14 +735,11 @@ cntrller=cntrller, user=user, email=email, - current=current, - password=password, - confirm=confirm, username=username, user_type_fd_id_select_field=user_type_fd_id_select_field, user_info_forms=user_info_forms, user_type_form_definition=user_type_form_definition, - widgets=widgets, + widgets=widgets, addresses=addresses, show_filter=show_filter, webapp=webapp, @@ -757,13 +750,11 @@ cntrller=cntrller, user=user, email=email, - current=current, - password=password, - confirm=confirm, username=username, webapp=webapp, message=message, status=status ) + # For REMOTE_USER, we need the ability to just edit the username @web.expose @web.require_login( "to manage the public name" ) diff -r e327eba84158eb62d0c5c76e77a62ae999fc3779 -r 5f739cf9187bde20a0b9d368bf83ffcac19eedc0 templates/user/info.mako --- a/templates/user/info.mako +++ b/templates/user/info.mako @@ -59,16 +59,16 @@ %if not is_admin: <div class="form-row"><label>Current password:</label> - <input type="password" name="current" value="${current}" size="40"/> + <input type="password" name="current" value="" size="40"/></div> %endif <div class="form-row"><label>New password:</label> - <input type="password" name="password" value="${password}" size="40"/> + <input type="password" name="password" value="" size="40"/></div><div class="form-row"><label>Confirm:</label> - <input type="password" name="confirm" value="${confirm}" size="40"/> + <input type="password" name="confirm" value="" size="40"/></div><div class="form-row"><input type="submit" name="change_password_button" value="Save"/> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
Bitbucket