Merge pull request #332 from foodcoops/feature/edit-address

Allow to edit address from user profile
This commit is contained in:
wvengen 2014-12-23 21:00:20 +01:00
commit 1c0db4374f
4 changed files with 28 additions and 4 deletions

View file

@ -15,7 +15,8 @@ class HomeController < ApplicationController
end
def update_profile
if @current_user.update_attributes(params[:user])
if @current_user.update_attributes(user_params)
@current_user.ordergroup.update_attributes(ordergroup_params) if ordergroup_params
session[:locale] = @current_user.locale
redirect_to my_profile_url, notice: I18n.t('home.changes_saved')
else
@ -61,4 +62,20 @@ class HomeController < ApplicationController
redirect_to my_profile_path, notice: I18n.t('home.ordergroup_cancelled', :group => membership.group.name)
end
protected
def user_params
params
.require(:user)
.permit(:first_name, :last_name, :email, :phone,
:password, :password_confirmation).merge(params[:user].slice(:settings_attributes))
end
def ordergroup_params
params
.require(:user)
.require(:ordergroup)
.permit(:contact_address)
end
end