|
|
|
@ -50,28 +50,12 @@ class MyController < ApplicationController
|
|
|
|
|
def account
|
|
|
|
|
@user = User.current
|
|
|
|
|
@pref = @user.pref
|
|
|
|
|
#Modified by young
|
|
|
|
|
unless @user.change_password_allowed?
|
|
|
|
|
flash[:error] = l(:notice_can_t_change_password)
|
|
|
|
|
redirect_to my_account_path
|
|
|
|
|
return
|
|
|
|
|
end
|
|
|
|
|
#Ended by young
|
|
|
|
|
|
|
|
|
|
if request.post?
|
|
|
|
|
@user.safe_attributes = params[:user]
|
|
|
|
|
@user.pref.attributes = params[:pref]
|
|
|
|
|
@user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
|
|
|
|
|
#Added by young
|
|
|
|
|
if @user.check_password?(params[:password])
|
|
|
|
|
@user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
|
|
|
|
|
if @user.save
|
|
|
|
|
flash[:notice] = l(:notice_account_password_updated)
|
|
|
|
|
# redirect_to my_account_path
|
|
|
|
|
end
|
|
|
|
|
else
|
|
|
|
|
flash[:error] = l(:notice_account_wrong_password)
|
|
|
|
|
end
|
|
|
|
|
#Ended by young
|
|
|
|
|
|
|
|
|
|
if @user.save
|
|
|
|
|
@user.pref.save
|
|
|
|
|
@user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
|
|
|
|
|