diff --git a/app/helpers/owner_type_helper.rb b/app/helpers/owner_type_helper.rb
index dd5dbbbac..c03f2d19e 100644
--- a/app/helpers/owner_type_helper.rb
+++ b/app/helpers/owner_type_helper.rb
@@ -6,4 +6,5 @@ module OwnerTypeHelper
   COMMENT = 5
   BID = 6
   JOURNALSFORMESSAGE = 7
+  HOMEWORKCOMMON = 8
 end
\ No newline at end of file
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index cb5c64778..b56406f19 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -11,6 +11,17 @@ class HomeworkCommon < ActiveRecord::Base
   has_many :homework_tests, :dependent => :destroy
   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 #用户活动
   acts_as_attachable
+
+  after_create :act_as_activity
+  after_destroy :delete_kindeditor_assets
+
+  def act_as_activity
+    self.acts << Activity.new(:user_id => self.user_id)
+  end
+  #删除对应的图片
+  def delete_kindeditor_assets
+    delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::HOMEWORKCOMMON
+  end
 end
diff --git a/app/views/homework_common/_homework_common_form.html.erb b/app/views/homework_common/_homework_common_form.html.erb
index 2418c5650..cbe054335 100644
--- a/app/views/homework_common/_homework_common_form.html.erb
+++ b/app/views/homework_common/_homework_common_form.html.erb
@@ -12,7 +12,7 @@
     <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
     <!--<textarea  name="" placeholder="请在此填入作业的要求及评分依据"  class=" w548 h150 mb10 fl"  ></textarea>-->
     <% if edit_mode %>
-        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::BID %>
+        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
     <% else %>
         <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
         <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor' %>