From bee355e7478585b8c6946a9c600c75648c5cfaa8 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 14 Nov 2015 09:43:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=96=87=E7=AB=A0=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B=20=E5=8A=A8=E6=80=81=E4=B8=AD=EF=BC=8C=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E4=B8=8D=E5=86=97=E4=BD=99=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/org_document_comments/edit.html.erb  | 1 +
 app/views/org_document_comments/index.html.erb | 1 -
 app/views/organizations/show.html.erb          | 3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb
index ffb04a4f9..b4f8662a3 100644
--- a/app/views/org_document_comments/edit.html.erb
+++ b/app/views/org_document_comments/edit.html.erb
@@ -21,6 +21,7 @@
         <input class="postDetailInput fl mr15" style="margin-bottom:15px;" maxlength="250" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @org_document.title %>" />
       </div>
       <div id="doc_title_hint"></div>
+      <div class="cl"></div>
       <div id="org_document_editor" class="mt15" style="">
         <div class="mt10">
           <%= kindeditor_tag 'org_document_comment[content]',@org_document.content, :editor_id => 'org_document_description_editor', :height => "150px" %>
diff --git a/app/views/org_document_comments/index.html.erb b/app/views/org_document_comments/index.html.erb
index a636b2ec8..d53ce543c 100644
--- a/app/views/org_document_comments/index.html.erb
+++ b/app/views/org_document_comments/index.html.erb
@@ -16,7 +16,6 @@
     <% @documents.each do |document| %>
         <script>
             $(function() {
-                console.log(111)
                 init_activity_KindEditor_data(<%= document.id%>, null, "87%");
             });
         </script>
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index e77cc7d09..358b30c7d 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -52,7 +52,7 @@
                 </div>
               </div>
           <% end %>
-          <% if act.org_act_type == 'OrgDocumentComment' %>
+          <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
             <script>
                 $(function() {
                     init_activity_KindEditor_data(<%= act.org_act.id%>, null, "87%");
@@ -69,3 +69,4 @@
   <% end %>
 
 
+