From eb36cb40ce6d131dba4ec859cf5f63f381d8af94 Mon Sep 17 00:00:00 2001
From: baiyu <whitefeather0126@gmail.com>
Date: Sat, 16 Nov 2013 10:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=8F=82=E4=B8=8E=E8=80=85?=
 =?UTF-8?q?=E7=9A=84=E4=BA=BA=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_list_projects.html.erb    | 8 ++++++--
 app/views/bids/show_participator.html.erb | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb
index ad36c0534..e1b8815b0 100644
--- a/app/views/bids/_list_projects.html.erb
+++ b/app/views/bids/_list_projects.html.erb
@@ -166,11 +166,15 @@
 						</tr>
 						<% else %>
 						<tr>
-						<td><%= l(:label_bidding_user) %>
+						<td><strong><%= l(:label_bidding_user) %>
 							<% unless b_project.user.nil? %>
 							<%= b_project.user.lastname %><%= b_project.user.firstname %>
-							<% end %>
+							<% end %></strong>
+						<!-- added by bai 加入学号	 -->
+							<p><strong><%= l(:label_bidding_user_studentcode) %> ：<%= b_project.user.user_extensions.student_id%></strong></p>
 						</td>
+						<!-- end -->
+						
 						</tr>
 						<tr>
 							<td style=" word-wrap: break-word; word-break: break-all"><%= l(:label_bidding_reason) %><%= b_project.description %></td>
diff --git a/app/views/bids/show_participator.html.erb b/app/views/bids/show_participator.html.erb
index 3681279b5..80492de32 100644
--- a/app/views/bids/show_participator.html.erb
+++ b/app/views/bids/show_participator.html.erb
@@ -1,5 +1,5 @@
 <!--add by bai-->
-<h3><%= l(:label_x_join_in_contest, :count => @bid.join_in_contests.count)%></h3>
+<h3><%=link_to l(:label_x_join_in_contest, :count => @bid.join_in_contests.count)+"("+@bid.join_in_contests(@user.id).count.to_s+")", :controller=>"bids", :action=>"show_participator"%></h3>
 <div class="inf_user_image">
 	<% for temp in @bid.join_in_contests %>
 	<% user = temp.user %>