Refactor: The controller is responsible for the before-destory behavi…

…our. If this is used in more that one place, it can be refactored to an operation.
fatfreecrm · Dec 5, 2016 · aae213f · aae213f
1 parent 861b7f6
commit aae213f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
@@ -76,7 +76,9 @@ def confirm
   # DELETE /admin/users/1.xml                                              AJAX
   #----------------------------------------------------------------------------
   def destroy
-    flash[:warning] = t(:msg_cant_delete_user, @user.full_name) unless @user.destroy
+    unless @user.check_if_current_user && @user.destroy
+      flash[:warning] = t(:msg_cant_delete_user, @user.full_name)
+    end
 
     respond_with(@user)
   end

diff --git a/app/models/users/user.rb b/app/models/users/user.rb
@@ -149,14 +149,14 @@ def check_if_needs_approval
     self.suspended_at = Time.now if Setting.user_signup == :needs_approval && !admin
   end
 
-  private
-
   # Prevent current user from deleting herself.
   #----------------------------------------------------------------------------
   def check_if_current_user
     User.current_user.nil? || User.current_user != self
   end
 
+  private
+
   # Prevent deleting a user unless she has no artifacts left.
   #----------------------------------------------------------------------------
   def check_if_has_related_assets