diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index f999e27d6..f7fb9b1aa 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -27,6 +27,8 @@ class Attachment < ActiveRecord::Base
   belongs_to :attachmentstype,  :foreign_key => "attachtype",:primary_key => "id"
   # 被ForgeActivity虚拟关联
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
   include UserScoreHelper
 
@@ -71,8 +73,8 @@ class Attachment < ActiveRecord::Base
   cattr_accessor :thumbnails_storage_path
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
-  before_save :files_to_final_location
-  after_create :office_conver, :be_user_score,:act_as_forge_activity# user_score
+  before_save :files_to_final_location,:act_as_course_activity
+  after_create :office_conver, :be_user_score,:act_as_forge_activity
   after_update :office_conver, :be_user_score
   after_destroy :delete_from_disk,:down_user_score
 
@@ -552,4 +554,10 @@ class Attachment < ActiveRecord::Base
     end
   end
 
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.container_type == "Course" && self.course_acts.empty?
+      self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.container_id)
+    end
+  end
 end
diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb
new file mode 100644
index 000000000..1b05e876d
--- /dev/null
+++ b/app/models/course_activity.rb
@@ -0,0 +1,7 @@
+class CourseActivity < ActiveRecord::Base
+  attr_accessible :user_id, :course_act_id,:course_act_type,:course_id
+  # 虚拟关联
+  belongs_to :act ,:polymorphic => true
+  belongs_to :course
+  belongs_to :user
+end
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 291c14563..5fe01db96 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -13,17 +13,27 @@ class HomeworkCommon < ActiveRecord::Base
   has_many :student_works, :dependent => :destroy
   has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   acts_as_attachable
   acts_as_event :title => Proc.new {|o| "#{l(:label_course_homework)} ##{o.id}: #{o.name}" },
                 :description => :description,
                 :author => :author,
                 :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
-  after_create :act_as_activity, :send_mail
+  after_create :act_as_activity, :send_mail, :act_as_course_activity
   after_destroy :delete_kindeditor_assets
 
   def act_as_activity
     self.acts << Activity.new(:user_id => self.user_id)
   end
+
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.course
+      self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.course_id)
+    end
+  end
+
   #删除对应的图片
   def delete_kindeditor_assets
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::HOMEWORKCOMMON
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index b15c9b2d1..bcae58174 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -56,9 +56,11 @@ class JournalsForMessage < ActiveRecord::Base
   acts_as_attachable
 
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
 
   validates :notes, presence: true, if: :is_homework_jour?
-  after_create :act_as_activity #huang
+  after_create :act_as_activity, :act_as_course_activity
   after_create :reset_counters!
   after_destroy :reset_counters!
   after_save :be_user_score
@@ -177,4 +179,11 @@ class JournalsForMessage < ActiveRecord::Base
   def delete_kindeditor_assets
     delete_kindeditor_assets_from_disk self.id,7
   end
+
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.jour_type == 'Course'
+      self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.jour_id)
+    end
+  end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
index 15d358789..de5cc3f9b 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -32,6 +32,8 @@ class Message < ActiveRecord::Base
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   # 被ForgeActivity虚拟关联
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
@@ -68,7 +70,7 @@ class Message < ActiveRecord::Base
   after_update :update_messages_board
   after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets
   
-  after_create :act_as_activity,:be_user_score,:act_as_forge_activity, :send_mail
+  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :send_mail
   #before_save :be_user_score
 
   scope :visible, lambda {|*args|
@@ -185,6 +187,13 @@ class Message < ActiveRecord::Base
                                              :project_id => self.board.project.id)
     end
   end
+
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.course
+      self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.board.course_id)
+    end
+  end
   
   #更新用户分数     -by zjc
   def be_user_score
diff --git a/app/models/news.rb b/app/models/news.rb
index 7d33d760e..e5c1d192a 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -28,6 +28,8 @@ class News < ActiveRecord::Base
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   # 被ForgeActivity虚拟关联
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
@@ -49,7 +51,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_activity,:act_as_forge_activity,:add_author_as_watcher, :send_mail
+  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:add_author_as_watcher, :send_mail
 
   after_destroy :delete_kindeditor_assets
 
@@ -121,6 +123,13 @@ class News < ActiveRecord::Base
     end
   end
 
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.course
+      self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.course_id)
+    end
+  end
+
   # Time 2015-03-31 13:50:54
   # Author lizanle
   # Description 删除news后删除对应的资源
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 64e9df79a..34a381246 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -8,7 +8,9 @@ class Poll < ActiveRecord::Base
   has_many :users, :through => :poll_users #该文件被哪些用户提交答案过
   # 添加课程的poll动态
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
-  after_create :act_as_activity
+  # 课程动态
+  has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
+  after_create :act_as_activity, :act_as_course_activity
 
   acts_as_event :title => Proc.new {|o| "#{l(:label_course_poll)}: #{o.polls_name}" },
                :description => :polls_description,
@@ -27,4 +29,10 @@ class Poll < ActiveRecord::Base
      self.acts << Activity.new(:user_id => self.user_id)
   end
 
+  #课程动态公共表记录
+  def act_as_course_activity
+    if self.polls_type == "Course"
+      self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.polls_group_id)
+    end
+  end
 end
diff --git a/db/migrate/20150811065543_add_course_activities.rb b/db/migrate/20150811065543_add_course_activities.rb
new file mode 100644
index 000000000..03ec7e354
--- /dev/null
+++ b/db/migrate/20150811065543_add_course_activities.rb
@@ -0,0 +1,15 @@
+class AddCourseActivities < ActiveRecord::Migration
+  def up
+    create_table :course_activities do |t|
+      t.integer :user_id
+      t.integer :course_id
+      t.integer :course_act_id
+      t.string :course_act_type
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :course_activities
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 30ca29d12..ac1bb987c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150801034945) do
+ActiveRecord::Schema.define(:version => 20150811065543) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",                                  :null => false
@@ -324,6 +324,15 @@ ActiveRecord::Schema.define(:version => 20150801034945) do
     t.datetime "updated_on",                  :null => false
   end
 
+  create_table "course_activities", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "course_id"
+    t.integer  "course_act_id"
+    t.string   "course_act_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
   create_table "course_attachments", :force => true do |t|
     t.string   "filename"
     t.string   "disk_filename"