解决竞赛，需求，作业列表搜索bug

app/controllers/bids_controller.rb

@@ -26,6 +26,8 @@ class BidsController < ApplicationController
     else
       @bids = Bid.visible.where('reward_type = ?', 1)
     end
+    
+   
 
     @bids = @bids.like(params[:name]) if params[:name].present?
     @bid_count = @bids.count

app/views/bids/_list_projects.html.erb

@@ -21,7 +21,7 @@
 						
 						<!-- 如果需求到期     并且是该需求的管理员  -->
 						
-						<td style="color: red;" align="right" valign="0.1em" width="15%">
+						<td style="color: red;" align="right" valign="0.1em" width="16%">
 							<strong><span id="reward_result_<%=b_project.id%>">
 						    <%=  l(:label_system_grade) %>:<%= (b_project.project.project_status.grade.nil? ? 0 : b_project.project.project_status.grade) unless (b_project.project.project_status.nil? && b_project.project.nil?) %>
 							<% if get_prize(b_project).nil? or get_prize(b_project) == "" %>

app/views/bids/contest.html.erb

@@ -1,5 +1,5 @@
 <!-- fq -->
-<%= form_tag(calls_path, :method => :get) do %>
+<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
 <div class="project-search-block">
 	<table width="100%" valign="center">
 		<tr>
@@ -19,7 +19,7 @@
 	<td align="right">
 	<div class="project-search">
 		<%= text_field_tag 'name', params[:name], :size => 30 %>
-		
+		<%= hidden_field_tag 'project_type', params[:project_type] %>
 		<%= submit_tag l(:label_search), :class => "small", :name => nil %>
 		
 	</div></td>

app/views/bids/index.html.erb

@@ -23,6 +23,9 @@
 	<div class="project-search">
 		<%= text_field_tag 'name', params[:name], :size => 30 %>
 		
+		<%= hidden_field_tag 'reward_type', params[:reward_type] %>
+		<%= hidden_field_tag 'project_type', params[:project_type] %>
+		
 		<%= submit_tag l(:label_search), :class => "small", :name => nil %>
 		
 	</div></td>

app/views/projects/_project.html.erb

@@ -88,7 +88,9 @@
 		<%= content_tag('span', "#{l(:label_create_time)}: ") %><%= content_tag('span', format_time(@project.created_on)) %>
 	</div>
 	<div class="grade">
+		<% if @project.project_type !=1 %>
 		<%= content_tag('span', "#{l(:label_project_grade)}: ")%><span style='color:red'><%= @project.project_status.grade%></span>
+	    <% end %>
 	</div>
 	<!--   added by  liuping  -->
 

app/views/projects/index.html.erb

@@ -14,8 +14,7 @@
 			<div class="project-search">
 				<%= text_field_tag 'name', params[:name], :size => 30 %>
 				<%= hidden_field_tag 'project_type', params[:project_type] %>
-				<%= submit_tag l(:label_search), :class => "small", :name => nil %>
-				
+				<%= submit_tag l(:label_search), :class => "small", :name => nil %>	
 			</div></td>
 		</tr>
 	</table>

app/views/users/index.html.erb

@@ -117,6 +117,10 @@
 	<div>
 		<%= link_to image_tag(url_to_avatar(user), :class => 'avatar'), user_path(user)  %>
 		<%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
+		<div style="position:relative;float:left;margin-top:-2px;margin-left: 100px">
+		<%= l(:label_user_grade) %>: <span style="color:red"><%= user.user_status.grade %></span>
+	</div>
+	 
 		<!-- <%= content_tag "div", "#{l(:label_user_grade)}:" %><%= user.user_status.grade %> -->
 	</div>
 	
@@ -125,9 +129,9 @@
 		<%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
 		
 	  </div>
-	  <div style="position:relative;float:left;margin-top:-20px;margin-left: 724px">
+	  <!-- <div style="position:relative;float:left;margin-top:-20px;margin-left: 724px">
 		<%= l(:label_user_grade) %>: <span style="color:red"><%= user.user_status.grade %></span>
-	</div>
+	</div> -->
 	 
 		<div class="user-bottom">
 			<% unless user.memberships.empty? %>

lib/redmine.rb

@@ -237,7 +237,7 @@ end
 
 Redmine::MenuManager.map :top_college_menu do |menu|
   menu.push :home, :home_path
-  menu.push :new_course, {:controller => 'projects', :action => 'course', :project_type => 1 }
+  menu.push :new_course, {:controller => 'projects', :action => 'course', :project_type => 1}
   menu.push :new_homework, {:controller => 'bids', :action => 'index', :project_type => 1 }
   menu.push :new_contest, {:controller => 'bids', :action => 'contest', :project_type => 1}
   menu.push :projects, { :controller => 'projects', :action => 'index', :project_type => 0 }, :caption => :label_project_plural