From e5baf0959b15dc69feb4378ac7ba668e35855821 Mon Sep 17 00:00:00 2001
From: baiyu <whitefeather0126@gmail.com>
Date: Fri, 15 Nov 2013 10:25:07 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=AB=9E=E8=B5=9B=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=80=85=E5=90=8D=E5=AD=97=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=85=A8=E7=A7=B0=202=E3=80=81=E4=B8=AA=E4=BA=BA=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E9=87=8C=E7=9A=84=E2=80=9C=E5=85=B3=E6=B3=A8=E2=80=9D?=
 =?UTF-8?q?=E4=B8=8E=E2=80=9C=E7=B2=89=E4=B8=9D=E2=80=9D=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=98=BE=E7=A4=BA=E5=85=A8=E7=A7=B0=203?=
 =?UTF-8?q?=E3=80=81=E5=8C=BA=E5=88=AB=E4=BA=86=E2=80=9C=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E2=80=9D=E9=87=8C=E4=B8=AA=E4=BA=BA=E5=8F=82=E4=B8=8E=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8E=E8=AF=BE=E7=A8=8B=204=E3=80=81?=
 =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E9=87=8C=E7=9A=84=E5=8F=82=E4=B8=8E=E8=80=85?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E4=B8=8E=E8=AF=BE=E7=A8=8B=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=9A=84=E6=98=BE=E7=A4=BA=E5=81=9A=E5=87=BA=E4=BA=86?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=205=E3=80=81=E7=AB=9E=E8=B5=9B=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=80=85=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E5=AD=A6=E5=91=98=E5=AD=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb         |  2 +-
 app/views/bids/show_participator.html.erb | 33 ++++++++++++++++++++---
 app/views/users/user_fanslist.html.erb    |  8 +++---
 app/views/users/user_watchlist.html.erb   | 25 +++++++++++++----
 4 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0d2b44b1b..24fb6ee81 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1404,7 +1404,7 @@ module ApplicationHelper
   
  # added by bai   
   def show_more_participate?(obj)
-    if obj.join_in_contests.count > 12
+    if obj.join_in_contests.count > 0
       return true
     else
       return false
diff --git a/app/views/bids/show_participator.html.erb b/app/views/bids/show_participator.html.erb
index 6ac248192..3681279b5 100644
--- a/app/views/bids/show_participator.html.erb
+++ b/app/views/bids/show_participator.html.erb
@@ -6,22 +6,47 @@
 	<ul class="list_watch"><li>
 <table width="660px" border="0" align="center">
   <tr>
-    <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>   
+  	<!-- modified by bai 显示人名全称-->
+    <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), 
+                                                                                        user_path(user), 
+                                                                                        :title => "#{user.show_name}" %></td>   
      <td><table width="580px" border="0">
       <tr>
-        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to_user(user), :class => "project_avatar_name" %>
+        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to_user(user.show_name), :class => "project_avatar_name" , 
+                                                                                                  :title => "#{user.show_name}" %>
+         
+       <!-- added by bai    增加了学员的学号  -->
+        <%= l(:label_bidding_user_studentcode) %> ：<%= user.user_extensions.student_id%>
         </td>
         </tr>
       <tr>
+      	<!-- modified by bai 区分课程与项目-->
         <td colspan="2" width="580px" ><p class="font_description">
 			<% unless user.memberships.empty? %>
-			<%= l(:label_x_contribute_to, :count => user.memberships.count) %>
+			<% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %>
+			<% memberships = user.memberships.all(:conditions => cond) %>
+			<%= l(:label_x_contribute_to, :count => memberships.count) %>
 			<% for member in user.memberships %>
 			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
 			<% end %>
 			<% end %>
-			</p></td>
+			</p>
+			
+		<!-- added by bai -->
+			<p class="font_description">
+				<% unless user.memberships.empty? %>
+			<% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %>
+			<% memberships = user.memberships.all(:conditions => cond) %>
+			<%= l(:label_x_course_contribute_to, :count => memberships.count) %>
+			<% for member in memberships %>
+			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
+			<% end %>
+			<% end %>
+			</p>
+			</td>
         </tr>
+        <!-- end -->
+        
       <tr>        
         <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
         </td>
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index 5a9e5b314..fb3a3f310 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -5,10 +5,12 @@
 	<ul class="list_watch"><li>
 <table width="660px" border="0" align="center">
   <tr>
-    <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>   
+    <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), 
+                                                                                        user_path(user), 
+                                                                                        :title => "#{user.name}" %></td>   
      <td><table width="580px" border="0">
-      <tr>
-        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to_user(user), :class => "project_avatar_name" %>
+      <tr>  <!-- modified by bai -->
+        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to_user(user.show_name), :class => "project_avatar_name" %>
         </td>
         </tr>
       
diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb
index bb6b40c6d..e93cd2c01 100644
--- a/app/views/users/user_watchlist.html.erb
+++ b/app/views/users/user_watchlist.html.erb
@@ -6,20 +6,35 @@
   <tr>
  <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>
      <td><table width="580px" border="0">
-      <tr>
-        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to_user(user), :class => "project_avatar_name" %>
+      <tr>  <!-- modified by bai 增加了关注人的名字全称-->
+        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to_user(user.show_name), :class => "project_avatar_name" %>
         </td>
         </tr>
-      <tr>
+      <tr>  <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
         <td colspan="2" width="580px" ><p class="font_description">
 			<% unless user.memberships.empty? %>
-			<%= l(:label_x_contribute_to, :count => user.memberships.count) %>
+			<% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %>
+			<% memberships = user.memberships.all(:conditions => cond) %>
+			<%= l(:label_x_contribute_to, :count => memberships.count) %>
 			<% for member in user.memberships %>
 			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
 			<% end %>
 			<% end %>
-			</p></td>
+			</p>
+			<p class="font_description">
+			<% unless user.memberships.empty? %>
+			<% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %>
+			<% memberships = user.memberships.all(:conditions => cond) %>
+			<%= l(:label_x_course_contribute_to, :count => memberships.count) %>
+			<% for member in memberships %>
+			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
+			<% end %>
+			<% end %>
+			</p>
+			</td>
         </tr>
+        <!-- end -->
+        
       <tr>        
         <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
         </td>