From 44c1675ecd717b92f61ca5f64ef7bae3429d6635 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 6 May 2016 16:20:47 +0800
Subject: [PATCH] =?UTF-8?q?To=20=E4=B8=80=E7=BA=A7=E6=A0=8F=E7=9B=AE=20|?=
 =?UTF-8?q?=20=E4=BA=8C=E7=BA=A7=E6=A0=8F=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sub_document_comments/_show_sub_document.html.erb      | 5 ++++-
 app/views/sub_document_comments/show.html.erb              | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/views/sub_document_comments/_show_sub_document.html.erb b/app/views/sub_document_comments/_show_sub_document.html.erb
index cc09042e3..135a48268 100644
--- a/app/views/sub_document_comments/_show_sub_document.html.erb
+++ b/app/views/sub_document_comments/_show_sub_document.html.erb
@@ -9,7 +9,10 @@
         <%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
         TO&nbsp;&nbsp;<%= link_to @organization.name, organization_path(@organization), :class => "newsBlue" %>
         |
-        <span style="color:#269ac9;"><a class="newsBlue"><%= document.sub_domain.name %></a></span>
+        <span style="color:#269ac9;"><%=link_to @org_subfield.name, organization_path(@organization, :org_subfield_id => @org_subfield.id), :class => "newsBlue" %></span>
+        |
+        <span style="color:#269ac9;"><%=link_to @subdomain.name, org_subfield_sub_domain_sub_document_comments_path(:sub_domain_id => @subdomain.id, :org_subfield_id => @org_subfield.id), :class => "newsBlue"  %></span>
+
         <%# if document.organization.home_id == document.id %>
             <!--<span class="red_homework_btn_cir ml5">已设为首页</span>-->
         <%# end %>
diff --git a/app/views/sub_document_comments/show.html.erb b/app/views/sub_document_comments/show.html.erb
index 607f16058..8fe59c22a 100644
--- a/app/views/sub_document_comments/show.html.erb
+++ b/app/views/sub_document_comments/show.html.erb
@@ -18,6 +18,9 @@
             <%= link_to User.find(@document.creator_id), user_url_in_org(@document.creator_id), :class => "newsBlue mr15" %>
             TO&nbsp;&nbsp;<%= link_to @organization.name, organization_path(@organization), :class => "newsBlue" %>
             |
+            <span style="color:#269ac9;"><%=link_to @org_subfield.name, organization_path(@organization, :org_subfield_id => @org_subfield.id), :class => "newsBlue" %></span>
+            |
+            <span style="color:#269ac9;"><%=link_to @subdomain.name, org_subfield_sub_domain_sub_document_comments_path(:sub_domain_id => @subdomain.id, :org_subfield_id => @org_subfield.id), :class => "newsBlue"  %></span>
             <%# if @organization.home_id == @document.id %>
                 <!--<span style="color:#269ac9;">首页</span>-->
             <%# else %>
@@ -53,7 +56,7 @@
                         <%= link_to "编辑文章", edit_org_subfield_sub_domain_sub_document_comment_path(@document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => @document.sub_domain.id, :flag => 1), :class => "postOptionLink" %>
                       </li>
                       <li>
-                        <%= link_to "删除文章", org_subfield_sub_domain_sub_document_comment_path(@document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => @document.sub_domain.id, :detail_page => 1), :method => 'delete',
+                        <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @organization.id, :detail_page => 1), :method => 'delete',
                                     :data => {:confirm => l(:text_are_you_sure)},
                                     :remote => true, :class => 'postOptionLink' %>
                       </li>
@@ -89,7 +92,7 @@
               </div>
           <% end %>
         </div>
-        <div class="" id="reply_sub_div_<%=  @document.id %>">
+        <div class="" id="reply_div_<%=  @document.id %>">
           <% comments_for_doc.each_with_index  do |reply,i| %>
               <script type="text/javascript">
                   $(function(){