1.将课程动态加入组织动态的过滤条件中；

2.创建文章成功后，给出信息提醒

app/controllers/org_document_comments_controller.rb

@@ -12,7 +12,7 @@ class OrgDocumentCommentsController < ApplicationController
     @org_document_comment.title = params[:org_document_comment][:title]
     @org_document_comment.content = params[:org_document_comment][:content]
     if @org_document_comment.save
-      #flash[:notice] = 'success'
+      flash.keep[:notice] = l(:notice_successful_create)
       OrgActivity
       redirect_to organization_org_document_comments_path(@organization)
     else

app/controllers/organizations_controller.rb

@@ -70,6 +70,14 @@ class OrganizationsController < ApplicationController
           @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Message' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
         when 'org'
           @org_activities = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_homework'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'HomeworkCommon' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_news'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'News' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_message'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Message' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_poll'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Poll' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
       end
       @page = params[:page]
       respond_to do |format|

app/views/org_document_comments/index.html.erb

@@ -19,6 +19,6 @@
                 init_activity_KindEditor_data(<%= document.id%>, null, "87%");
             });
         </script>
-          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document} %>
+          <%= render :partial => 'organizations/show_org_document', :locals => {:document => document, :act => OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id=?", document.id).first} %>
     <% end %>
 <% end %>

app/views/organizations/show.html.erb

@@ -17,6 +17,19 @@
   <ul class="resourcesSelect">
     <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
       <ul class="homepagePostType">
+        <li>
+          <ul class="homepagePostTypeHomework fl">
+            <li class="f14">课程动态</li>
+            <li><%= link_to "作业动态", {:controller => "organizations", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+              <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
+            <li><%= link_to "通知动态", {:controller => "organizations", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
+              <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
+            <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+            <li><%= link_to "问卷动态", {:controller => "organizations", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+              <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+              <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+          </ul>
+        </li>
         <li>
           <ul class="homepagePostTypeProject fl">
             <li class="f14">项目动态</li>
@@ -48,12 +61,13 @@
     <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
         <%= render :partial => 'show_org_document', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %>
 <% end  %>
-
-<%= render :partial =>  'organizations/org_activities',
+<% if @org_activities %>
+    <%= render :partial =>  'organizations/org_activities',
            :locals => {:org_activities =>@org_activities,
                        :page=>@page,
                        :org => @organization,
                        :org_act_count=>@org_activities.count}%>
+<% end %>