maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplication in users_controller.rb (#4337)

Browse source 
* Remove duplication

* Naming
This commit is contained in:
Juliette de Rancourt 2019-10-10 16:48:23 +02:00 • committed by Ben Halpern
parent b61db22dc5
commit d8e04a0a09
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/controllers/users_controller.rb
View file

@ -100,30 +100,14 @@ class UsersController < ApplicationController
current_user.assign_attributes(params[:user].permit(:summary, :location, :employment_title, :employer_name, :last_onboarding_page)) if params[:user]
current_user.saw_onboarding = true
authorize User
if current_user.save
respond_to do |format|
format.json { render json: { outcome: "updated successfully" } }
end
else
respond_to do |format|
format.json { render json: { outcome: "update failed" } }
end
end
render_update_response
end
def onboarding_checkbox_update
current_user.assign_attributes(params[:user].permit(:checked_code_of_conduct, :checked_terms_and_conditions, :email_membership_newsletter, :email_digest_periodic)) if params[:user]
current_user.saw_onboarding = true
authorize User
if current_user.save
respond_to do |format|
format.json { render json: { outcome: "updated successfully" } }
end
else
respond_to do |format|
format.json { render json: { outcome: "update failed" } }
end
end
render_update_response
end
def join_org
@ -232,6 +216,18 @@ class UsersController < ApplicationController
private
def render_update_response
if current_user.save
respond_to do |format|
format.json { render json: { outcome: "updated successfully" } }
end
else
respond_to do |format|
format.json { render json: { outcome: "update failed" } }
end
end
end
def handle_organization_tab
@organizations = @current_user.organizations.order("name ASC")
if params[:org_id] == "new" || params[:org_id].blank? && @organizations.size.zero?