Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/org_document_comments/add_reply.js.erb

@@ -1,3 +1,3 @@
-$("#organization_document_<%= @document.id %>").html("");
-$("#organization_document_<%= @document.id %>").html("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document}) %>");
+
+$("#organization_document_<%= @document.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document}) %>");
 init_activity_KindEditor_data(<%= @document.id %>,"","87%");

app/views/org_document_comments/index.html.erb

@@ -19,8 +19,6 @@
                 init_activity_KindEditor_data(<%= document.id%>, null, "87%");
             });
         </script>
-        <p id="organization_document_<%= document.id %>">
           <%= render :partial => 'organizations/show_org_document', :locals => {:document => document} %>
-        </p>
     <% end %>
 <% end %>

app/views/organizations/_show_org_document.html.erb

@@ -1,4 +1,4 @@
-<div class="resources mt10">
+<div class="resources mt10" id="organization_document_<%= document.id %>">
 <div class="homepagePostBrief">
   <div class="homepagePostPortrait">
     <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %>
@@ -7,7 +7,7 @@
     <div class="homepagePostTo">
       <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %>
       TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue"  %> |
-      <% if defined?(home_id) %>
+      <% if document.organization.home_id == document.id   %>
        <span style="color:#269ac9;">首页</span>
       <% else %>
         <span style="color:#269ac9;">组织</span>

app/views/organizations/show.html.erb

@@ -30,9 +30,8 @@
             init_activity_KindEditor_data(<%= @organization.home_id%>, null, "87%");
         });
     </script>
-    <p id="organization_document_<%= @organization.home_id %>">
+
         <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id} %>
-    </p>
 <% end  %>
 
   <% unless @activities.nil? %>
@@ -58,9 +57,7 @@
                     init_activity_KindEditor_data(<%= act.org_act.id%>, null, "87%");
                 });
             </script>
-            <p id="organization_document_<%= act.org_act.id %>" style="mt10">
                 <%= render :partial => 'show_org_document', :locals => {:document => act.org_act} %>
-            </p>
           <% end %>
       <% end %>
     <ul class="wlist" style=" border:none; padding-top: 15px;">

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151110011003) do
+ActiveRecord::Schema.define(:version => 20151112072948) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -960,6 +960,7 @@ ActiveRecord::Schema.define(:version => 20151110011003) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
+    t.integer  "sticky",                       :default => 0
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"