From 1494821b675989ac27b2aa09dbfb3f06e79240e1 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 10 Dec 2014 20:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=90=9C=E7=B4=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 52 +++++++++++++++--------------
 app/services/users_service.rb       | 12 +++++++
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4049c2ae8..084e720d8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -364,33 +364,35 @@ class UsersController < ApplicationController
     sort_init 'login', 'asc'
     sort_update %w(login firstname lastname mail admin created_on last_login_on)
     (redirect_to user_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
-    case params[:format]
-    when 'xml', 'json'
-      @offset, @limit = api_offset_and_limit({:limit => 15})
+      case params[:format]
+      when 'xml', 'json'
+        @offset, @limit = api_offset_and_limit({:limit => 15})
+      else
+        @limit = 15#per_page_option
+      end
+      #
+      #@status = params[:status] || 1
+      #has = {
+      #  "show_changesets" => true
+      #}
+      #   scope = User.logged.status(@status)
+      #   @search_by = params[:search_by] ? params[:search_by][:id] : 0
+      #   scope = scope.like(params[:name],@search_by) if params[:name].present?
+    us = UsersService.new
+    scope = us.search_user params
+    @user_count = scope.count
+    @user_pages = Paginator.new @user_count, @limit, params['page']
+    @user_base_tag = params[:id] ? 'base_users':'users_base'
+    @offset ||= @user_pages.reverse_offset
+    unless @offset == 0
+      @users = scope.offset(@offset).limit(@limit).all.reverse
     else
-      @limit = 15#per_page_option
+      limit = @user_count % @limit
+      if limit == 0
+        limit = @limit
+      end
+      @users = scope.offset(@offset).limit(limit).all.reverse
     end
-
-    @status = params[:status] || 1
-    has = {
-      "show_changesets" => true
-    }
-       scope = User.logged.status(@status)
-       @search_by = params[:search_by] ? params[:search_by][:id] : 0
-       scope = scope.like(params[:name],@search_by) if params[:name].present?
-       @user_count = scope.count
-       @user_pages = Paginator.new @user_count, @limit, params['page']
-       @user_base_tag = params[:id] ? 'base_users':'users_base'
-       @offset ||= @user_pages.reverse_offset
-          unless @offset == 0
-          @users = scope.offset(@offset).limit(@limit).all.reverse
-        else
-          limit = @user_count % @limit
-          if limit == 0
-            limit = @limit
-          end
-          @users = scope.offset(@offset).limit(limit).all.reverse
-        end
         
     respond_to do |format|
       format.html {
diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index 9587427b5..d281edb19 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -126,4 +126,16 @@ class UsersService
     @current_user
   end
 
+  #搜索用户
+  def search_user params
+    @status = params[:status] || 1
+    has = {
+        "show_changesets" => true
+    }
+    scope = User.logged.status(@status)
+    @search_by = params[:search_by] ? params[:search_by][:id] : 0
+    scope = scope.like(params[:name],@search_by) if params[:name].present?
+    scope
+  end
+
 end