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/my_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/my_controller.rb')
| -rw-r--r-- | app/controllers/my_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index bc9a42a63..1c5a039ea 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -62,7 +62,7 @@ class MyController < ApplicationController # Change user's password def change_password @user = self.logged_in_user - flash[:notice] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id + flash[:error] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id if @user.check_password?(params[:password]) @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation] if @user.save @@ -72,7 +72,7 @@ class MyController < ApplicationController return end else - flash[:notice] = l(:notice_account_wrong_password) + flash[:error] = l(:notice_account_wrong_password) end redirect_to :action => 'account' end |