From 7ce8e330c3e15a1fc5baf059a774f7df0f364889 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 18 Dec 2015 16:21:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/_course_journalsformessage.html.erb | 41 +++----------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 27549f6d9..69f966979 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -26,7 +26,7 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% count=course.journals_for_messages.where('m_parent_id IS NULL').count %>
+  <% count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
     <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
     <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
@@ -47,7 +47,7 @@
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
           <ul>
-            <% course.journals_for_messages.where('m_parent_id IS NULL').reorder("created_on desc").each do |comment| %>
+            <% fetch_user_leaveWord_reply(activity).each do |comment| unless fetch_user_leaveWord_reply(activity).nil? %>
                 <script type="text/javascript">
                     $(function(){
                         showNormalImage('reply_content_<%= comment.id %>');
@@ -68,43 +68,12 @@
                       <%= format_time(comment.created_on) %>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %></div>
-                    <% fetch_user_leaveWord_reply(comment).each do |reply| unless fetch_user_leaveWord_reply(comment).nil? %>
-                        <script type="text/javascript">
-                            $(function(){
-                                showNormalImage('reply_to_content_<%= reply.id %>');
-                            });
-                        </script>
-                        <div class="recall">
-                          <div class="homepagePostReplyPortrait">
-                            <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.user_id), :alt => "用户头像" %>
-                          </div>
-                          <div class="homepagePostReplyjournal">
-                              <div class="homepagePostReplyPublisher">
-                                <% if reply.try(:user).try(:realname) == ' ' %>
-                                    <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                                <% else %>
-                                    <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                                <% end %>
-                                <%= l(:label_reply_to)%>
-                                <% if comment.try(:user).try(:realname) == ' ' %>
-                                    <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14 ml10" %>
-                                <% else %>
-                                    <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14 ml10" %>
-                                <% end %>
-                                <%= format_time reply.created_on %>
-                              </div>
-                            <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" style="max-width: 580px;" id="reply_to_content_<%= reply.id %>">
-                              <%= reply.notes.html_safe %></div>
-                              <div class="cl"></div>
-                          </div>
-                          <div class="cl"></div>
-                        </div>
-                      <% end %>
-                    <% end %>
+                      <%= comment.notes.html_safe %>
+                    </div>
                   </div>
                   <div class="cl"></div>
                 </li>
+              <% end %>
             <% end %>
           </ul>
         </div>