From 8af92ef29bb82026c94dc5d903cbf79c418ebc57 Mon Sep 17 00:00:00 2001
From: baiyu <whitefeather0126@gmail.com>
Date: Wed, 11 Dec 2013 16:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E9=9D=9E=E6=9C=AC?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E7=94=A8=E6=88=B7=E8=83=BD=E7=9C=8B?=
 =?UTF-8?q?=E8=A7=81=E5=AD=A6=E7=94=9F=E5=AD=A6=E5=8F=B7=20=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E4=BA=86=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E9=87=8C?=
 =?UTF-8?q?=E8=83=BD=E7=9C=8B=E8=A7=81=E5=AD=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_member_list.html.erb | 11 +++++++----
 app/views/users/user_fanslist.html.erb   |  2 +-
 app/views/users/user_watchlist.html.erb  |  2 +-
 config/database.yml                      |  6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/views/projects/_member_list.html.erb b/app/views/projects/_member_list.html.erb
index 3b81b6615..d90a0d6d4 100644
--- a/app/views/projects/_member_list.html.erb
+++ b/app/views/projects/_member_list.html.erb
@@ -8,11 +8,14 @@
 		<%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :class => 'avatar'))  %>
 		<%= content_tag "div", link_to(member.user.show_name, user_path(member.user)), :class => "nomargin avatar_name" %>
 		<!--teacher's code disapeared  moified by huang-->
-		<% unless member.user.user_extensions.identity ==0 %>
-	    <!-- added by bai 加学号 -->	    
-	    <%= content_tag "p", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :class => "nomargin avatar_name" %>
-		<% end %>
+		
 		<% if @project.project_type == 1 %>
+			<% unless member.user.user_extensions.identity ==0 %>
+		    <!-- added by bai 加学号 -->	
+		    	<% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil?) %>   
+		    		<%= content_tag "p", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :class => "nomargin avatar_name" %>
+				<% end %>
+			<% end %>
 			<div class ="clear avatar_name"> &nbsp;
 				<p>
 				</p>
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index bfdf29075..51a6ab09a 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -10,7 +10,7 @@
                                                                                         :title => "#{user.name}" %></td>   
      <td><table width="580px" border="0">
       <tr>  <!-- modified by bai -->
-        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to_user(user.show_name), :class => "project_avatar_name" %>
+        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.show_name,user_path(user)), :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 31047e92b..bd9246f49 100644
--- a/app/views/users/user_watchlist.html.erb
+++ b/app/views/users/user_watchlist.html.erb
@@ -7,7 +7,7 @@
  <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>  <!-- modified by bai 增加了关注人的名字全称-->
-        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to_user(user.show_name), :class => "project_avatar_name" %>
+        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.show_name,user_path(user)), :class => "project_avatar_name" %>
         </td>
         </tr>
       <tr>  <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
diff --git a/config/database.yml b/config/database.yml
index 1073a8f6f..e29681aba 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -15,12 +15,12 @@ production:
 
 development:
   adapter: mysql2
-  database: test
-  host: 10.107.17.20
+  database: trustie
+  host: 10.0.47.98
   #socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
   port: 3306
   username: root
-  password: "1234"
+  password: "123456"
   encoding: utf8
 
 # Warning: The database defined as "test" will be erased and