From c965f72ce3191173b08507e260e4fc0187d768ca Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 25 Nov 2016 19:19:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=9B=9E=E5=A4=8D=E7=9A=84?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb                           | 2 ++
 app/views/projects/_comment_reply_detail.html.erb           | 4 ++--
 .../projects/_project_issue_comments_reply_detail.html.erb  | 4 ++--
 app/views/users/_comment_reply_detail.html.erb              | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a1a5ecacb..99be0d588 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3418,6 +3418,8 @@ def get_reply_by_type type, reply_id
       reply = Comment.find reply_id
     when 'Issue'
       reply = Journal.find reply_id
+    when 'Journal'
+      reply = Journal.find reply_id
     when 'Syllabus'
       reply = JournalsForMessage.find reply_id
   end
diff --git a/app/views/projects/_comment_reply_detail.html.erb b/app/views/projects/_comment_reply_detail.html.erb
index d415beeef..f6e2b8fb3 100644
--- a/app/views/projects/_comment_reply_detail.html.erb
+++ b/app/views/projects/_comment_reply_detail.html.erb
@@ -1,7 +1,7 @@
 <div class="orig_user fl">
   <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
 </div>
-<div class="orig_right fl" onmouseout="$(this).children('.orig_reply').show();" onmouseover="$(this).children('.orig_reply').show();">
+<div class="orig_right fl">
   <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
   <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
   <div class="orig_content ">
@@ -16,7 +16,7 @@
         <%= comment.content_detail.html_safe %>
     <% end %>
   </div>
-  <div class="orig_reply mt-10 none">
+  <div class="orig_reply mt-10">
     <div class="reply">
         <span class="reply-right">
             <span id="reply_praise_count_<%=comment.id %>">
diff --git a/app/views/projects/_project_issue_comments_reply_detail.html.erb b/app/views/projects/_project_issue_comments_reply_detail.html.erb
index f2645f0bf..58b9f941e 100644
--- a/app/views/projects/_project_issue_comments_reply_detail.html.erb
+++ b/app/views/projects/_project_issue_comments_reply_detail.html.erb
@@ -1,7 +1,7 @@
 <div class="orig_user fl">
   <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
 </div>
-<div class="orig_right fl" onmouseout="$(this).children('.orig_reply').show();" onmouseover="$(this).children('.orig_reply').show();">
+<div class="orig_right fl">
   <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
   <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
   <div class="orig_content ">
@@ -16,7 +16,7 @@
         <%= comment.content_detail.html_safe %>
     <% end %>
   </div>
-  <div class="orig_reply mt-10 none">
+  <div class="orig_reply mt-10">
     <div class="reply">
         <span class="reply-right">
             <span id="reply_praise_count_<%=comment.id %>">
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb
index e5522b4a5..23382d972 100644
--- a/app/views/users/_comment_reply_detail.html.erb
+++ b/app/views/users/_comment_reply_detail.html.erb
@@ -1,7 +1,7 @@
 <div class="orig_user fl">
 <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user), :alt => "用户头像" %>
 </div>
-<div class="orig_right fl" onmouseout="$(this).children('.orig_reply').show();" onmouseover="$(this).children('.orig_reply').show();">
+<div class="orig_right fl">
   <%= link_to comment.creator_user.show_name, user_path(comment.creator_user), :class => "content-username" %>
   <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
   <div class="orig_content">
@@ -16,7 +16,7 @@
         <%= comment.content_detail.html_safe %>
     <% end %>
   </div>
-  <div class="orig_reply mt-10 none">
+  <div class="orig_reply mt-10">
     <div class="reply">
         <span class="reply-right">
             <span id="reply_praise_count_<%=comment.id %>">
@@ -39,7 +39,7 @@
             <span style="position: relative" class="fr mr20">
                 <%= link_to(
                             l(:button_reply),
-                            {:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id},
+                            {:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :parent_id => parent_id},
                             :remote => true,
                             :method => 'get',
                             :title => l(:button_reply)) %>