From 8f8fb79a63fccd9cff8e7f1de5dff2e494f6f937 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 14 Jul 2014 16:29:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=BD=AF=E4=BB=B6=E5=88=9B=E5=AE=A2=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=BA=E5=9C=A8js=E4=B8=AD=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=202.=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E6=98=AF=E4=B8=8D=E6=98=AF=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb |  2 +-
 app/views/users/index.html.erb      | 19 ++++++++++++++++---
 app/views/users/search.html.erb     | 19 +++++++++++++++----
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a3d512b5d..36e57de5a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -329,7 +329,7 @@ class UsersController < ApplicationController
     when 'xml', 'json'
       @offset, @limit = api_offset_and_limit({:limit => 15})
     else
-    @limit = 15#per_page_option
+      @limit = 15#per_page_option
     end
 
     @status = params[:status] || 1
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 27e601a5f..ef46c0a5f 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,6 +1,18 @@
 <!-- modified by huang -->
+<script type="text/javascript">
+    function searchUser(){
+        var name = $("#name").val();
+        if(name == "")
+        {
+            alert("搜索条件不能为空");
+            return;
+        }
+        $("#search_user_form").submit();
+    }
+</script>
+
 <div class="top-content">
-	<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %>
+	<%= form_tag( users_search_path, :method => :get, :id => 'search_user_form') do %>
 	<table width="940px">
 		<tr>
 			<td class="info_font" style="width: 220px; color: #15bccf" ><%= l(:label_software_user ) %></td>
@@ -9,8 +21,9 @@
 			</td>
 			<td rowspan="2" >	
 			<div class="project-search" style="float: right">						
-			<%= text_field_tag 'name', params[:name], :size => 30 %>	
-			<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>			
+			<%= text_field_tag 'name', params[:name], :size => 30 %>
+              <input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="searchUser();"/>
+			<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
 			</div>			
 			</td>
 		</tr>
diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb
index 307803b1d..98becc197 100644
--- a/app/views/users/search.html.erb
+++ b/app/views/users/search.html.erb
@@ -1,7 +1,17 @@
-
+<script type="text/javascript">
+    function searchUser(){
+        var name = $("#name").val();
+        if(name == "")
+        {
+            alert("搜索条件不能为空");
+            return;
+        }
+        $("#search_user_form").submit();
+    }
+</script>
 
 <div class="top-content">
-	<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %>
+  <%= form_tag( users_search_path, :method => :get, :id => 'search_user_form') do %>
 	<table width="940px">
 		<tr>
 			<td class="info_font" style="width: 220px; color: #15bccf "><%= l(:label_software_user ) %></td>
@@ -10,8 +20,9 @@
 			</td>
 			<td rowspan="2" >	
 			<div class="project-search" style="float: right">						
-			<%= text_field_tag 'name', params[:name], :size => 30 %>	
-			<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>			
+			<%= text_field_tag 'name', params[:name], :size => 30 %>
+            <input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="searchUser();"/>
+			<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
 			</div>			
 			</td>
 		</tr>