From a8ef1884f3e2b304934b2e7f91ded6adcbc75412 Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Mon, 16 Dec 2013 04:26:10 -0300
Subject: [PATCH] users-controller: refactor index action

---
 app/controllers/admin/users_controller.rb | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index a83cc57..1671e82 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -6,28 +6,18 @@ class UsersController < 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 < AdminController
     end
   end
 
+  private
+
+  def per_page
+    10
+  end
+
 end
--
libgit2 0.21.2