From 28606f030d77cd69b455db898fb4d6842a948718 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 29 Jul 2014 17:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2=E5=8F=82?=
 =?UTF-8?q?=E8=B5=9B=E4=BD=9C=E5=93=81=E7=BB=93=E6=9E=9C=E7=BF=BB=E9=A1=B5?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/softapplications_controller.rb        |  2 +-
 .../_base_softapplication_index_top_content.html.erb  |  2 +-
 app/views/softapplications/search.html.erb            | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 app/views/softapplications/search.html.erb

diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb
index 89bdce5b7..c216a3e93 100644
--- a/app/controllers/softapplications_controller.rb
+++ b/app/controllers/softapplications_controller.rb
@@ -330,7 +330,7 @@ class SoftapplicationsController < ApplicationController
     #new added end
 
     respond_to do |format|
-      format.js
+      format.html
     end
   end
 
diff --git a/app/views/layouts/_base_softapplication_index_top_content.html.erb b/app/views/layouts/_base_softapplication_index_top_content.html.erb
index de9930d91..ff897a866 100644
--- a/app/views/layouts/_base_softapplication_index_top_content.html.erb
+++ b/app/views/layouts/_base_softapplication_index_top_content.html.erb
@@ -17,7 +17,7 @@
 			<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 			<td rowspan="2" width="305px">
 				<div class="project-search" style="float: right">
-                  <%= form_tag({:controller => 'softapplications', :action => 'search'}, :method => :get, :remote => true, :id => "search_softapplications") do %>
+                  <%= form_tag({:controller => 'softapplications', :action => 'search'}, :method => :get, :id => "search_softapplications") do %>
                       <%= text_field_tag 'name', params[:name], :size => 25 %>
                       <%= hidden_field_tag 'project_type', params[:project_type] %>
                       <input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="searchUser();"/>
diff --git a/app/views/softapplications/search.html.erb b/app/views/softapplications/search.html.erb
new file mode 100644
index 000000000..0f0913139
--- /dev/null
+++ b/app/views/softapplications/search.html.erb
@@ -0,0 +1,11 @@
+<%=render :partial => 'layouts/base_softapplication_index_top_content'%>
+
+<% if @softapplications.size > 0%>
+    <%#= sort_softapplication(@s_state)%>
+    <div width="95%" border="0" style="padding-left: 10px; padding-top: 10px;" id="softapplications_list">
+      <%= render :partial => "list"  %>
+    </div>
+<% else %>
+    <%= render :partial => "layouts/no_content"%>
+<% end %>
+<% html_title l(:label_contest_work_list)%>
\ No newline at end of file