From bf3a3f3652704fb261e6220e2199830ea22ec8d3 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Fri, 16 Jun 2017 10:29:43 +0200 Subject: fix api and controller issues --- app/controllers/admin/users_controller.rb | 4 ++-- lib/api/users.rb | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 41fe359b590..754d9209138 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -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 @@ -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 diff --git a/lib/api/users.rb b/lib/api/users.rb index 733b65b1c8e..ba59818ba84 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -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 @@ -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' -- cgit v1.2.1