From fef005d2d37ff30c3983bc72df23201d3fee8d4d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 25 Nov 2014 11:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 5 +++--
 app/views/users/search.html.erb     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0db7facbc..4049c2ae8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -376,12 +376,13 @@ class UsersController < ApplicationController
       "show_changesets" => true
     }
        scope = User.logged.status(@status)
-       scope = scope.like(params[:name],params[:search_by][:id]) if params[:name].present?
+       @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
+          unless @offset == 0
           @users = scope.offset(@offset).limit(@limit).all.reverse
         else
           limit = @user_count % @limit
diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb
index f5bbc3b8d..f8d5a7cf3 100644
--- a/app/views/users/search.html.erb
+++ b/app/views/users/search.html.erb
@@ -20,8 +20,8 @@
 			</td>
 			<td rowspan="2" >	
 			<div class="project-search" style="float: right">
-              <label for="user_browse_label"><%= l(:label_user_search_type) %></label>
-              <%= select  "search_by", "id",
+              <!--label for="user_browse_label"><%#= l(:label_user_search_type) %></label-->
+              <%#= select  "search_by", "id",
                           { l(:label_search_by_login) => "0", l(:label_search_by_name) => "1", l(:label_search_by_email) => "2" },
                           :size => 20 %>
 			<%= text_field_tag 'name', params[:name], :size => 30 %>