Merge remote-tracking branch 'origin/szzh' into szzh

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" %>

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>

app/views/organizations/show.html.erb

@@ -51,7 +51,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%");
@@ -66,3 +66,4 @@
   <% end %>
 
 
+