From dcde828e64457822f598483d37d6a3b371e84689 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 29 Aug 2014 09:40:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5--?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E3=80=81=E7=B2=89=E4=B8=9D=EF=BC=8C=E5=8D=B3?=
 =?UTF-8?q?=E4=BD=BF=E5=85=B3=E6=B3=A8=E8=80=85=E3=80=81=E7=B2=89=E4=B8=9D?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=82=E5=8A=A0=E9=A1=B9=E7=9B=AE=E3=80=81?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E4=BA=860=E4=B8=AA=E9=A1=B9=E7=9B=AE/?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E2=80=9D=20#1211=202=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E5=85=B3=E6=B3=A8=E3=80=81?=
 =?UTF-8?q?=E7=B2=89=E4=B8=9D=E5=8F=82=E4=B8=8E=E8=AF=BE=E7=A8=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=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/views/users/user_fanslist.html.erb  | 27 +++++++++----------------
 app/views/users/user_watchlist.html.erb | 25 ++++++++++++-----------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index 984cdf352..f16e6d397 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -20,27 +20,18 @@
                   <tr>
                     <!-- added by bai 区分了个人列表里的项目与课程 -->
                     <td colspan="2" width="580px"><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_contribute_to, :count => memberships.count) %>
-                          <% for member in memberships %>
-                              <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
-                          <% end %>
-                      <% else %>
-                          <%= l(:label_x_contribute_to, :count => 0) %>
+                      <% 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 memberships %>
+                          <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
                       <% end %>
 
                       <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 %>
-                        <% else %>
-                            <%= l(:label_x_course_contribute_to, :count => 0) %>
+                        <% user_courses = user_courses_list(user) %>
+                        <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
+                        <% for course in user_courses %>
+                            <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
                         <% end %>
                       </p>
                     </td>
diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb
index bc4a655d8..e58e35d27 100644
--- a/app/views/users/user_watchlist.html.erb
+++ b/app/views/users/user_watchlist.html.erb
@@ -7,31 +7,32 @@
  <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.name,user_path(user)), :class => "project_avatar_name" %>
+        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %></strong>
         </td>
         </tr>
       <tr>  <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
         <td colspan="2" width="580px" ><p class="font_description">
-			<% unless user.memberships.empty? %>
+			<%# unless user.memberships.empty? %>
 			<% 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 memberships %>
 			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
 			<% end %>
-			<% end %>
+			<%# end %>
 			</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 %>
+			<%# unless user.memberships.empty? %>
+              <% user_courses = user_courses_list(user) %>
+              <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
+              <% for course in user_courses %>
+                  <%# if course.name != nil %>
+                  <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
+                  <%# end %>
+              <% end %>
+			<%# end %>
 			</p>
-			</td>
+		</td>
         </tr>
         <!-- end -->