Skip to content
Snippets Groups Projects
Commit bf3a3f36 authored by James Lopez's avatar James Lopez
Browse files

fix api and controller issues

parent 36bc2e90
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -154,7 +154,7 @@ class Admin::UsersController < Admin::ApplicationController
email = user.emails.find(params[:email_id])
email.destroy
 
result = Users::UpdateService.new(current_user, @user).execute do
result = Users::UpdateService.new(current_user, @user).execute do |user|
user.update_secondary_emails!
end
 
Loading
Loading
@@ -215,7 +215,7 @@ class Admin::UsersController < Admin::ApplicationController
end
 
def update_user
result = Users::UpdateService.new(current_user, user).execute do
result = Users::UpdateService.new(current_user, user).execute do |user|
yield(user)
end
 
Loading
Loading
Loading
Loading
@@ -277,7 +277,10 @@ module API
not_found!('Email') unless email
 
email.destroy
user.update_secondary_emails!
Users::UpdateService.new(current_user, user).execute do |user|
user.update_secondary_emails!
end
end
 
desc 'Delete a user. Available only for admins.' do
Loading
Loading
@@ -508,7 +511,9 @@ module API
not_found!('Email') unless email
 
email.destroy
current_user.update_secondary_emails!
Users::UpdateService.new(current_user, user).execute do |user|
user.update_secondary_emails!
end
end
 
desc 'Get a list of user activities'
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment