diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-02 17:42:20 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-02 17:42:20 +0000 |
commit | 2d5ac54d2eb9f49b8a2f65b4469aa6d95a1e85d6 (patch) | |
tree | efc30fe2b599ba2cce8f368460b76c32fb197413 /app/controllers/account_controller.rb | |
parent | 7701de9ae4fd85ef7ddc0e3a26e2234793d7e902 (diff) | |
download | redmine-2d5ac54d2eb9f49b8a2f65b4469aa6d95a1e85d6.tar.gz redmine-2d5ac54d2eb9f49b8a2f65b4469aa6d95a1e85d6.zip |
Applied the flash notices patch by Matt Jones (slightly edited).
flash[:notice] and flash[:error] are now used for notice/error messages.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@600 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/account_controller.rb')
-rw-r--r-- | app/controllers/account_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index ecf37ed53..842247158 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -54,7 +54,7 @@ class AccountController < ApplicationController end redirect_back_or_default :controller => 'my', :action => 'page' else - flash.now[:notice] = l(:notice_account_invalid_creditentials) + flash.now[:error] = l(:notice_account_invalid_creditentials) end end end @@ -89,9 +89,9 @@ class AccountController < ApplicationController if request.post? user = User.find_by_mail(params[:mail]) # user not found in db - flash.now[:notice] = l(:notice_account_unknown_email) and return unless user + flash.now[:error] = l(:notice_account_unknown_email) and return unless user # user uses an external authentification - flash.now[:notice] = l(:notice_can_t_change_password) and return if user.auth_source_id + flash.now[:error] = l(:notice_can_t_change_password) and return if user.auth_source_id # create a new token for password recovery token = Token.new(:user => user, :action => "recovery") if token.save |