From a9059c4c2eb1d0866f0009e03a7e27675638f1f8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 3 May 2016 19:32:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=B7=BB=E5=8A=A0=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4=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       |  2 +-
 .../_show_sub_document.html.erb               | 25 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb
index db288306d..a5f4ce125 100644
--- a/app/controllers/sub_document_comments_controller.rb
+++ b/app/controllers/sub_document_comments_controller.rb
@@ -90,7 +90,7 @@ class SubDocumentCommentsController < ApplicationController
   end
 
   def edit
-    @org_document = OrgDocumentComment.find(params[:id])
+    @org_document = SubDocumentComment.find(params[:id])
     @flag = params[:flag]
     @organization = Organization.find(params[:organization_id])
   end
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 b500f69a4..83d285976 100644
--- a/app/views/sub_document_comments/_show_sub_document.html.erb
+++ b/app/views/sub_document_comments/_show_sub_document.html.erb
@@ -35,7 +35,30 @@
       <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
     <%# end %>-->
-      <!--编辑删除暂时隐藏
+      <% if User.current.admin? || User.current.admin_of_org?(@organization) || User.current.id == document.creator_id %>
+          <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <!--<li>-->
+                    <!--<%#= form_for('new_form', :url => {:controller => 'organizations', :action => 'set_homepage', :id => document.organization_id, :home_id => document.id, :show_homepage => 1}, :method => "put", :remote => true) do |f| %>-->
+                        <!--<a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">设为首页</a>-->
+                    <!--<%# end %>-->
+                  <!--</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, :flag => flag), :method => 'edit', :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, :flag => flag), :method => 'delete',
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :remote => true, :class => 'postOptionLink' %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+          <div class="cl"></div>
+      <% end %>
       <!--over-->
 
     </div>