Refactor: The controller is responsible for the before-creation behav…

…iour. If this is used in more that one place, it can be refactored to an operation.

app/controllers/admin/users_controller.rb

@@ -47,6 +47,7 @@ def create
     params[:user][:email].try(:strip!)
     params[:user][:password_confirmation] = nil if params[:user][:password_confirmation].blank?
     @user = User.new(user_params)
+    @user.check_if_needs_approval
     @user.save_without_session_maintenance
 
     respond_with(@user)

app/models/users/user.rb

@@ -39,7 +39,6 @@
 #
 
 class User < ActiveRecord::Base
-  before_create :check_if_needs_approval
   before_destroy :check_if_current_user, :check_if_has_related_assets
 
   has_one :avatar, as: :entity, dependent: :destroy  # Personal avatar.
@@ -143,14 +142,15 @@ def to_xml(_options = nil)
     [name].to_xml
   end
 
-  private
 
   # Suspend newly created user if signup requires an approval.
   #----------------------------------------------------------------------------
   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