@@ -83,8 +83,7 @@ class TypusController < ApplicationController session[:typus_user_id] = @user.id redirect_to admin_dashboard_path else - flash[:error] = _("Passwords don't match.") - redirect_to admin_reset_password_path(:token => params[:token]) + render :action => 'reset_password' end end end app/controllers/typus_controller.rb @@ -2,6 +2,8 @@ <%= hidden_field_tag :token, @user.token %> + <%= error_messages_for :user, :header_message => nil, :message => nil %> + <ul> <li><label for="password"><%= _("Password") %></label> <%= password_field :user, :password, :size => 20, :class => 'text' %></li> app/views/typus/reset_password.html.erb @@ -12,7 +12,6 @@ es: "That doesn't seem like a valid email address": "Eso no parecia una dirección válida de correo electrónico." "I remember my password": "Recuerdo mi contraseña" "Password recovery link sent to your email": "Enlace de recuperación de contraseña enviado a tu correo electrónico." - "Passwords don't match": "Las Contraseñas no coinciden." "A valid token is required": "Se requiere un token válido." "The email and/or password you entered is invalid": "El correo y/o la contraseña proporcionadas no son válidas." "There are not defined applications in config/typus/*.yml": "There are not defined applications in config/typus/*.yml" config/locales/typus/es.yml @@ -16,7 +16,6 @@ "That doesn't seem like a valid email address": "I remember my password": "Password recovery link sent to your email": - "Passwords don't match": "A valid token is required": "The email and/or password you entered is invalid": "There are not defined applications in config/typus/*.yml": config/locales/typus/language.yml.template @@ -12,7 +12,6 @@ pt-BR: "That doesn't seem like a valid email address": "Este não parece um email válido" "I remember my password": "Lembro minha senha" "Password recovery link sent to your email": "Link para recuperar senha enviado para seu email." - "Passwords don't match": "As senhas não conferem." "A valid token is required": "É necessário um token válido." "The email and/or password you entered is invalid": "O email e/ou a senha que você colocou são inválidos." "There are not defined applications in config/typus/*.yml": "Não há aplicativos definidos em config/typus/*.yml" config/locales/typus/pt-BR.yml @@ -12,7 +12,6 @@ ru: "That doesn't seem like a valid email address": "E-Mail некорректен" "I remember my password": "Запомнить пароль" "Password recovery link sent to your email": "Ссылка для восставновления пароля выслана по указанному E-Mail" - "Passwords don't match": "Пароли не совпадают" "A valid token is required": "Необходим корректный ключ" "The email and/or password you entered is invalid": "E-Mail или пароль введены неверно" "There are not defined applications in config/typus/*.yml": "Ни одного приложения не определено в config/typus/*.yml" config/locales/typus/ru.yml @@ -523,6 +523,15 @@ input#search { margin: 0.5em 0em; } + #dialog .errorExplanation ul { + margin: 10px 0 10px 0px!important; + } + + #dialog .errorExplanation li { + font-weight: bold; + list-style: none!important; + } + /* @end */ /* @group Pagination */ generators/typus/templates/public/stylesheets/admin/screen.css @@ -127,8 +127,7 @@ class TypusControllerTest < ActionController::TestCase def test_should_be_redirected_if_password_does_not_match_confirmation typus_user = typus_users(:admin) post :reset_password, { :token => typus_user.token, :user => { :password => 'drowssap', :password_confirmation => 'drowssap2' } } - assert_response :redirect - assert_redirected_to admin_reset_password_path(:token => typus_user.token) + assert_response :success end def test_should_only_be_allowed_to_reset_password test/functional/typus_controller_test.rb 3da5d97c628504b3a9815fb127f864591606109c Francesc Esplugas francesc@intraducibles.com http://github.com/fesplugas/typus/commit/75cc929397c4b377a1b6d2d726c95ac499be50f2 75cc929397c4b377a1b6d2d726c95ac499be50f2 2009-07-03T07:35:49-07:00 2009-07-03T07:35:49-07:00 Updated error message when user resets password. [Closes Ticket #5] c5c8a3ecb342d494a7676714257f8e88b72a3703 Francesc Esplugas francesc@intraducibles.com