From e02ad85bbb711076b93e155da6d7b6353d961384 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 25 Mar 2016 15:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E4=BC=98=E5=8C=96=EF=BC=88=E4=B8=BB=E8=A6=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=AC=A1=E6=95=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_project_activities.html.erb | 4 ++--
 app/views/users/_project_message.html.erb       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index 536921c13..f0a0a3f4b 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -48,7 +48,7 @@
 </script>
 
 <% unless forge_acts.empty? %>
-    <% forge_acts.each do |activity| -%>
+    <% forge_acts.includes(:forge_act).each do |activity| -%>
         <script>
             function expand_reply(container, btnid) {
                 var target = $(container);
@@ -80,7 +80,7 @@
             <%= render :partial => 'users/project_issue', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :project_id => activity.project_id} %>
             <!--message    -->
         <% when "Message" %>
-            <%= render :partial => 'users/project_message', :locals => {:activity => activity.forge_act,:user_activity_id =>activity.id,:is_course=>1,:is_board=>0} %>
+            <%= render :partial => 'users/project_message', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :is_course => 1, :is_board => 0} %>
             <!--new 新闻-->
         <% when "News" %>
             <% if !activity.forge_act.nil? and activity.forge_act.project %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index dd2c832cf..2e7fb0f12 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -108,7 +108,7 @@
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
           <ul>
-            <% activity.children.reorder("created_on desc").each do |reply| %>
+            <% activity.children.includes(:author).reorder("created_on desc").each do |reply| %>
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= reply.id %>');