deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-02 13:29:24 +02:00
parent 2be5e6d443
commit 46bf3a0949
14 changed files with 95 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/controllers/profile_controller.rb → app/controllers/profiles_controller.rb
View file

@ -1,5 +1,6 @@
class ProfileController < ApplicationController
class ProfilesController < ApplicationController
before_filter :user
layout 'profile'
def show
end
@ -7,8 +8,15 @@ class ProfileController < ApplicationController
def design
end
def account
end
def update
@user.update_attributes(params[:user])
if @user.update_attributes(params[:user])
flash[:notice] = "Profile was successfully updated"
else
flash[:alert] = "Failed to update profile"
end
respond_to do |format|
format.html { redirect_to :back }
@ -19,7 +27,7 @@ class ProfileController < ApplicationController
def token
end
def password_update
def update_password
params[:user].reject!{ |k, v| k != "password" && k != "password_confirmation"}
if @user.update_attributes(params[:user])
@ -31,14 +39,25 @@ class ProfileController < ApplicationController
end
def reset_private_token
current_user.reset_authentication_token!
redirect_to profile_account_path
if current_user.reset_authentication_token!
flash[:notice] = "Token was successfully updated"
end
redirect_to account_profile_path
end
def history
@events = current_user.recent_events.page(params[:page]).per(20)
end
def update_username
@user.update_attributes(username: params[:user][:username])
respond_to do |format|
format.js
end
end
private
def user