users-controller: refactor index action

Rodrigo Souto
1 parent 2e30180c
Showing 1 changed file with 12 additions and 16 deletions Show diff stats
app/controllers/admin/users_controller.rb
@@ -6,28 +6,18 @@ class UsersController &lt; AdminController
   include UsersHelper
-  def per_page
-    10
-  end
-
   def index
     @filter = params[:filter]
-    if @filter.blank? || @filter == 'all_users'
-      @filter = 'all_users'
-      scope = environment.people.no_templates(environment)
-    elsif @filter == 'admin_users'
-      scope = environment.people.no_templates(environment).admins
+    scope = environment.people.no_templates
+    if @filter == 'admin_users'
+      scope = scope.admins
     elsif @filter == 'activated_users'
-      scope = environment.people.no_templates(environment).activated
+      scope = scope.activated
     elsif @filter == 'deactivated_users'
-      scope = environment.people.no_templates(environment).deactivated
+      scope = scope.deactivated
     end
     @q = params[:q]
-    if @q.blank?
-      @collection = scope.paginate(:per_page => per_page, :page => params[:npage])
-    else
-      @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
-    end
+    @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
   end
   def set_admin_role
@@ -95,4 +85,10 @@ class UsersController &lt; AdminController
     end
   end
+  private
+
+  def per_page
+    10
+  end
+
 end