From dcbdea9bb50927342583da661134bf2c3fb01468 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 20 Nov 2015 14:50:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B=202.=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=AD=EF=BC=8C=E6=96=87=E7=AB=A0=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=AD=E5=9B=9E=E5=A4=8D=E4=BA=BA=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_document_comments_controller.rb | 3 +++
 app/views/org_document_comments/destroy.js.erb      | 3 ++-
 app/views/org_document_comments/show.html.erb       | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index 82a25cb01..fb40032d4 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -75,6 +75,9 @@ class OrgDocumentCommentsController < ApplicationController
         org.home_id == nil
       end
     end
+    respond_to do |format|
+      format.js
+    end
   end
 
   def delete_reply
diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb
index bcebe9d37..adbeff4a6 100644
--- a/app/views/org_document_comments/destroy.js.erb
+++ b/app/views/org_document_comments/destroy.js.erb
@@ -1 +1,2 @@
-location.reload();
\ No newline at end of file
+//location.reload();
+window.location.href = '<%= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>'
\ No newline at end of file
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index ae90b15bb..9df568e02 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -79,6 +79,7 @@
                   <%= link_to image_tag(url_to_avatar(user), :width => 33,:height => 33), user_path(user) %>
                 </div>
                 <div class="homepagePostReplyDes">
+                  <%= link_to User.find(reply.creator_id).realname, user_path(reply.creator_id), :class => "newsBlue mr10 f14" %>
                   <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe unless reply.content.nil? %>
                   </div>