From 4f2bd2dc31017b12ac378486272234ea443ba093 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 6 Jan 2017 12:15:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpullrequest=E5=B0=8F=E9=93=83?=
 =?UTF-8?q?=E9=93=9B=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/pull_requests_controller.rb    | 2 +-
 app/views/layouts/_show_messages_list.html.erb | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 20d7eb15c..8784a2811 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -360,7 +360,7 @@ class PullRequestsController < ApplicationController
                         :project_id => project_id,
                         :forge_message_id => pull_request_id,
                         :forge_message_type => "PullRequest",
-                        :viewed => false,
+                        :viewed => true,
                         :status => status,
                         :operate_user_id => User.current.id,
     )
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 00bf175a0..d2b5dff4d 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -150,10 +150,10 @@
           <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" %>
           <li><a href="<%=news_path(ma.forge_message.commented.id) %>" target="_blank" title="<%=ma.forge_message.author.show_name %> 评论了新闻：<%= ma.forge_message.commented.title%>"><span class="shadowbox_news_user"><%=ma.forge_message.author.show_name %> </span>评论了新闻：<%= ma.forge_message.commented.title%></a></li>
-      <% elsif ma.forge_message_type == "PullRequest" && PullRequest.where(:pull_request_id => ma.forge_message_id).count != 0%>
-              <% send_message_user =  PullRequest.where(:pull_request_id => ma.forge_message_id) %>
-              <% author = User.find(ma.operate_user_id.nil? ? 2 : ma.operate_user_id) %>
-              <li><a href="<%= project_pull_requests_path(ma.project_id) %>" target="_blank" title="<%= User.find(author.id).show_name %> <%= pull_request_message_status(ma) %> <%= send_message_user[0].title %>"><span class="shadowbox_news_user"><%= User.find(author.id).show_name %> </span><%= pull_request_message_status(ma) %> <%= send_message_user[0].title %></a></li>
+      <%# elsif ma.forge_message_type == "PullRequest" && PullRequest.where(:pull_request_id => ma.forge_message_id).count != 0%>
+              <%# send_message_user =  PullRequest.where(:pull_request_id => ma.forge_message_id) %>
+              <%# author = User.find(ma.operate_user_id.nil? ? 2 : ma.operate_user_id) %>
+            <!--  <li><a href="<%#= project_pull_requests_path(ma.project_id) %>" target="_blank" title="<%#= User.find(author.id).show_name %> <%#= pull_request_message_status(ma) %> <%#= send_message_user[0].title %>"><span class="shadowbox_news_user"><%#= User.find(author.id).show_name %> </span><%#= pull_request_message_status(ma) %> <%#= send_message_user[0].title %></a></li>-->
       <% end %>
     <% elsif ma.class == MemoMessage %>
       <% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %>