From 5a4f422b1cce2804d4b9299bca6fc73b20d2b94a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Mar 2016 16:44:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_at_message.html.erb     | 14 ++++++++++----
 app/views/users/_user_message_course.html.erb |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb
index c4a257358..dd5ffbe56 100644
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@@ -5,10 +5,16 @@
             <span class="newsBlue homepageNewsPublisher"><%= ma.author.login %></span><span class="homepageNewsType fl">提到了你：</span>
           </li>
           <li class="homepageNewsContent fl">
-            <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course, :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
-                        :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
-                        :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></li>
+            <% if ma.at_message_type == "Message" %>
+                <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
+                                                                     :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
+                            :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
+                            :onmouseover =>"message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %>
+            <% else %>
+                <%= link_to ma.subject.html_safe, ma.url, :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
+            <% end %>
+            </li>
           <div  style="display: none" class="message_title_red system_message_style">
             <p><strong>标题：</strong><%= ma.subject %></p>
             <% unless ma.description.nil? %>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index ff91375c8..bb9fc1174 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -246,7 +246,8 @@
     <% if ma.course_message_type == "Message" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
             <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
           <% if ma.course_message.parent_id.nil? %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">

From 3d2ba83c366ab151e59ec6d96980d91dfc31ada2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Mar 2016 17:22:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?@=E6=B6=88=E6=81=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_at_message.html.erb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb
index dd5ffbe56..343741cd4 100644
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@@ -5,9 +5,15 @@
             <span class="newsBlue homepageNewsPublisher"><%= ma.author.login %></span><span class="homepageNewsType fl">提到了你：</span>
           </li>
           <li class="homepageNewsContent fl">
-            <% if ma.at_message_type == "Message" %>
+            <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
                 <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
-                                                                     :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
+                            :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
+                            :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
+                            :onmouseover =>"message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %>
+            <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
+                <%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,
+                            :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
                             :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
                             :onmouseover =>"message_titile_show($(this),event)",
                             :onmouseout => "message_titile_hide($(this))" %>