From ae298f9b5519d30da73433708d6e282b2f1678fe Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 6 May 2016 14:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=96=E5=AD=90=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sub_document_comments_controller.rb        |  6 +-----
 app/views/sub_document_comments/show.html.erb  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb
index 502e815d2..767e1ba29 100644
--- a/app/controllers/sub_document_comments_controller.rb
+++ b/app/controllers/sub_document_comments_controller.rb
@@ -84,11 +84,7 @@ class SubDocumentCommentsController < ApplicationController
           # render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'
           # redirect_to organization_path(@organization)
         else
-          # if params[:flag].to_i == 1
-          #   redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id)
-          # else
-          #   redirect_to organization_path(@org_document.organization.id, :org_subfield_id => params[:org_subfield_id])
-          # end
+          redirect_to org_subfield_sub_domain_sub_document_comment_path(:org_subfield_id => params[:org_subfield_id], :sub_domain_id => params[:sub_domain_id])
         end
       }
     end
diff --git a/app/views/sub_document_comments/show.html.erb b/app/views/sub_document_comments/show.html.erb
index 0c2733086..a2d2c8181 100644
--- a/app/views/sub_document_comments/show.html.erb
+++ b/app/views/sub_document_comments/show.html.erb
@@ -44,16 +44,16 @@
                 <ul>
                   <li class="homepagePostSettingIcon">
                     <ul class="homepagePostSettiongText">
+                      <!--<li>-->
+                        <!--&lt;!&ndash;<%#= form_for('new_form', :url => {:controller => 'sub_document_comments', :action => 'set_homepage', :id => @organization.id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<%# end %>&ndash;&gt;-->
+                      <!--</li>-->
                       <li>
-                        <%= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => @organization.id, :home_id => @document.id}, :method => "put", :remote => true) do |f| %>
-                            <a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>
-                        <% end %>
+                        <%= 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 "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @organization.id, :flag => 1), :class => "postOptionLink" %>
-                      </li>
-                      <li>
-                        <%#= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @organization.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>
@@ -83,13 +83,13 @@
           </div>
           <% if count > 3 %>
               <div class="homepagePostReplyBannerMore">
-                <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+                <a id="reply_btn_<%= @document.id %>" onclick="expand_reply('#reply_sub_div_<%= @document.id %> li','#reply_btn_<%= @document.id %>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
                   展开更多
                 </a>
               </div>
           <% end %>
         </div>
-        <div class="" id="reply_div_<%=  @document.id %>">
+        <div class="" id="reply_sub_div_<%=  @document.id %>">
           <% comments_for_doc.each_with_index  do |reply,i| %>
               <script type="text/javascript">
                   $(function(){