From 3ccdf7f9ae35d3f5d4307d951ab55cb11f60d7ba Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 5 Jul 2016 15:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=97=AE=E7=AD=94=E5=8C=BA?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=9A=84?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E5=BA=94?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=89=93=E5=BC=80=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_show_messages_list.html.erb | 4 ++--
 app/views/users/_user_message_course.html.erb  | 4 ++--
 app/views/users/_user_message_forge.html.erb   | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 54f9b7ba3..ba31c4379 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -51,7 +51,7 @@
           <li><a href="<%= poll_path(ma.course_message.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name %>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>发布了问卷：<%= ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name%></a></li>
       <% elsif ma.course_message_type == "Message" %>
           <% content = ma.course_message.parent_id.nil? ? ma.course_message.subject : ma.course_message.content.html_safe %>
-          <% href = course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id) %>
+          <% href = board_message_path(ma.course_message.board_id, ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id) %>
           <li><a href="<%= href %>" target="_blank" title="<%=ma.course_message.author.show_name %> <%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %><%= content%>"><span class="shadowbox_news_user"><%=ma.course_message.author.show_name %> </span><%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %><%= content%></a></li>
       <% elsif ma.course_message_type == "StudentWorksScore" %>
           <li><a href="<%= student_work_index_path(:homework => ma.course_message.student_work.homework_common_id) %>" target="_blank" title="<%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%>"><span class="shadowbox_news_user"><%=ma.course_message.reviewer_role == 3 ? '匿名用户' : ma.course_message.user.show_name+"老师" %> </span><%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %><%= ma.content.html_safe if !ma.content.nil?%></a></li>
@@ -104,7 +104,7 @@
       <% elsif ma.forge_message_type == "Journal" %>
           <li><a href="<%=issue_path(:id => ma.forge_message.journalized_id) %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 更新了问题状态：<%= ma.forge_message.journalized.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>更新了问题状态：<%= ma.forge_message.journalized.subject%></a></li>
       <% elsif ma.forge_message_type == "Message" %>
-          <li><a href="<%=project_boards_path(ma.forge_message.project,:parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,:topic_id => ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%></a></li>
+          <li><a href="<%=board_message_path(ma.forge_message.board_id, ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> <%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%></a></li>
       <% elsif ma.forge_message_type == "News" %>
           <li><a href="<%=news_path(ma.forge_message.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 发布了新闻：<%= ma.forge_message.title.html_safe%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>发布了新闻：<%= ma.forge_message.title.html_safe%></a></li>
       <% elsif ma.forge_message_type == "Comment" %>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index fc66711d3..f48ce7010 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -295,7 +295,7 @@
             <%= 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">
-                <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
+                <%= link_to ma.course_message.subject, board_message_path(ma.course_message.board_id, ma.course_message.id),
                             :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
@@ -309,7 +309,7 @@
               </div>
           <% else %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
+                <%= link_to ma.course_message.content.html_safe, board_message_path(ma.course_message.board_id, ma.course_message.parent_id),
                             :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                             <!--:onmouseover =>"message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 9da768d0e..7a5fa17c9 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -156,9 +156,7 @@
           <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span></li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
-                                                                      :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
-                                                                      :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+            <%= link_to ma.forge_message.subject, board_message_path(ma.forge_message.board_id, ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
             <!--:onmouseover => "message_titile_show($(this),event)",-->
             <!--:onmouseout => "message_titile_hide($(this))" %>-->
           </a>