From a63f58de5b9c156f114d45eceb5c13ecb4883fc6 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 30 Sep 2016 14:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BB=A3=E7=A0=81=E7=9A=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/blog_comments/show.html.erb                  | 6 +++---
 app/views/blogs/_homepage.html.erb                     | 6 +++---
 app/views/org_document_comments/show.html.erb          | 6 +++---
 app/views/organizations/_org_subfield_message.html.erb | 6 +++---
 app/views/organizations/_show_org_document.html.erb    | 6 +++---
 app/views/users/_course_journalsformessage.html.erb    | 6 +++---
 app/views/users/_course_message.html.erb               | 6 +++---
 app/views/users/_project_message.html.erb              | 6 +++---
 app/views/users/_user_blog.html.erb                    | 6 +++---
 app/views/users/_user_journalsformessage.html.erb      | 6 +++---
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index 45a621816..7143e980b 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -106,7 +106,8 @@
   </div>
   <div class="cl"></div>
   <% all_comments = []%>
-  <% count=get_all_children(all_comments, @article).count %>
+  <% all_replies = get_all_children(all_comments, @article) %>
+  <% count= all_replies.count %>
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
       <div class="homepagePostReplyBannerCount">回复
@@ -119,8 +120,7 @@
       <div class="homepagePostReplyBannerTime"></div>
     </div>
 
-    <% all_comments = []%>
-    <% comments = get_all_children(all_comments, @article) %>
+    <% comments = all_replies %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= @article.id %>">
           <% comments.each do |comment| %>
diff --git a/app/views/blogs/_homepage.html.erb b/app/views/blogs/_homepage.html.erb
index a076ed15c..6e45fdd88 100644
--- a/app/views/blogs/_homepage.html.erb
+++ b/app/views/blogs/_homepage.html.erb
@@ -46,12 +46,12 @@
     <div class="cl"></div>
   </div>
   <% all_comments = []%>
-  <% count=get_all_children(all_comments, activity).count %>
+  <% all_repies = get_all_children(all_comments, activity) %>
+  <% count = all_repies.count %>
   <div class="homepagePostReply">
     <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 1} %>
 
-    <% all_comments = []%>
-    <% comments = get_all_children(all_comments, activity)[0..2] %>
+    <% comments = all_repies[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
           <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 1, :user_id => activity.author_id}%>
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index 1321fc83e..0fe72ad36 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -75,7 +75,8 @@
         </div>
       </div>
       <% all_comments = []%>
-      <% count=get_all_children(all_comments, @document).count %>
+      <% all_replies = get_all_children(all_comments, @document) %>
+      <% count = all_replies.count %>
 
       <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= @document.id %>">
         <%# if count > 0 %>
@@ -88,8 +89,7 @@
           </div>
         </div>
 
-        <% all_comments = []%>
-        <% comments = get_all_children(all_comments, @document) %>
+        <% comments = all_replies %>
         <div class="" id="reply_div_<%=  @document.id %>">
           <% comments.each do |comment| %>
               <script type="text/javascript">
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index d12464b3c..8cf19aec9 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -70,12 +70,12 @@
     <div class="cl"></div>
   </div>
   <% all_comments = []%>
-  <% count=get_all_children(all_comments, activity).count %>
+  <% all_replies = get_all_children(all_comments, activity) %>
+  <% count = all_replies.count %>
   <div class="homepagePostReply">
     <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => 0,:is_board =>0} %>
 
-    <% all_comments = []%>
-    <% comments = get_all_children(all_comments, activity)[0..2] %>
+    <% comments = all_replies[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
           <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => 0, :is_board =>0}%>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index c5df04dfb..bcdaa382e 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -68,13 +68,13 @@
     </div>
   </div>
   <% all_comments = []%>
-  <% count=get_all_children(all_comments, document).count %>
+  <% all_replies = get_all_children(all_comments, document) %>
+  <% count = all_replies.count %>
 
   <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= document.id %>">
     <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => document, :user_activity_id => act.id} %>
 
-    <% all_comments = []%>
-    <% comments = get_all_children(all_comments, document)[0..2] %>
+    <% comments = all_replies[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= act.id %>">
           <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => act.id, :type => 'OrgDocumentComment', :activity_id =>document.id}%>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index ae5b50619..f93efefe3 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -41,12 +41,12 @@
     <div class="cl"></div>
   </div>
   <% all_comments = []%>
-  <% count=get_all_children(all_comments, activity).count %>
+  <% all_replies = get_all_children(all_comments, activity) %>
+  <% count = all_replies.count %>
   <div class="homepagePostReply">
     <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
-    <% all_comments = []%>
-    <% comments = get_all_children(all_comments, activity)[0..2] %>
+    <% comments = all_replies[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
           <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :activity_id =>activity.id}%>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 9cbe9d61d..99e3aca62 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -81,12 +81,12 @@
     <div class="cl"></div>
   </div>
   <% all_comments = []%>
-  <% count=get_all_children(all_comments, activity).count %>
+  <% all_replies = get_all_children(all_comments, activity) %>
+  <% count = all_replies.count %>
   <div class="homepagePostReply">
     <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %>
 
-    <% all_comments = []%>
-    <% comments = get_all_children(all_comments, activity)[0..2] %>
+    <% comments = all_replies[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
           <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => is_course, :is_board =>is_board}%>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index d590b9a66..8005d9694 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -82,14 +82,14 @@
     <div class="cl"></div>
   </div>
   <% all_comments = []%>
-  <% count=get_all_children(all_comments, activity).count %>
+  <% all_replies = get_all_children(all_comments, activity) %>
+  <% count = all_replies.count %>
   <%# allow_delete = (activity.user == User.current || User.current.admin? || User.current.allowed_to?(:as_teacher,activity.course)) %>
   <%# count = fetch_user_leaveWord_reply(activity).count %>
   <div class="homepagePostReply">
     <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id,:is_course => is_course,:is_board =>is_board} %>
 
-    <% all_comments = []%>
-    <% comments = get_all_children(all_comments, activity)[0..2] %>
+    <% comments = all_replies[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
           <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Message', :activity_id =>activity.id, :is_course => is_course, :is_board =>is_board}%>
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 5361a37ad..7906f7a7c 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -42,12 +42,12 @@
     <div class="cl"></div>
   </div>
   <% all_comments = []%>
-  <% count=get_all_children(all_comments, activity).count %>
+  <% all_replies = get_all_children(all_comments, activity) %>
+  <% count = all_replies.count %>
   <div class="homepagePostReply">
     <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 0} %>
 
-    <% all_comments = []%>
-    <% comments = get_all_children(all_comments, activity)[0..2] %>
+    <% comments = all_replies[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
           <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 0, :user_id => activity.author_id}%>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index 7880cde99..e4bad29b4 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -63,12 +63,12 @@
     <div class="cl"></div>
   </div>
   <% all_comments = []%>
-  <% count=get_all_children(all_comments, activity).count %>
+  <% all_replies = get_all_children(all_comments, activity) %>
+  <% count = all_replies.count %>
   <div class="homepagePostReply">
     <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %>
 
-    <% all_comments = []%>
-    <% comments = get_all_children(all_comments, activity)[0..2] %>
+    <% comments = all_replies[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
           <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'JournalsForMessage', :activity_id =>activity.id}%>