Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-04 20:35:57 +01:00
Code Issues Packages Projects Releases Activity

notice messages translation

Browse Source 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@17 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2006-07-30 10:47:02 +00:00
parent 2a96f56956
commit 18ee1fef41
24 changed files with 116 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
redmine/app/controllers/account_controller.rb
View File

@@ -72,14 +72,19 @@ class AccountController < ApplicationController
# Change logged in user's password
def change_password
@user = self.logged_in_user
flash.now[:notice] = l(:notice_can_t_change_password) and render :action => 'my_account' and return if @user.auth_source_id
flash[:notice] = l(:notice_can_t_change_password) and redirect_to :action => 'my_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]
flash.now[:notice] = l(:notice_account_password_updated) if @user.save
if @user.save
flash[:notice] = l(:notice_account_password_updated)
else
render :action => 'my_account'
return
end
else
flash.now[:notice] = l(:notice_account_wrong_password)
flash[:notice] = l(:notice_account_wrong_password)
end
render :action => 'my_account'
redirect_to :action => 'my_account'
end
# Enable user to choose a new password