use can?

4 weeks ago · fd9eb09dd6
parent c53ed7f984
commit fd9eb09dd6
1 changed files with 2 additions and 1 deletions
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -27,7 +27,8 @@ class UsersController < ApplicationController
    existing_user = User.accessible_by(current_ability).find_by(email: @user.email)

    if existing_user
-      if existing_user.archived_at? && authorize!(:manage, existing_user) && authorize!(:manage, @user.account)
+      if existing_user.archived_at? &&
+         current_ability.can?(:manage, existing_user) && current_ability.can?(:manage, @user.account)
        existing_user.assign_attributes(@user.slice(:first_name, :last_name, :role, :account_id))
        existing_user.archived_at = nil
        @user = existing_user