diff --git a/app/models/course_activity.rb b/app/models/course_activity.rb index cf356dc05..1d0920c1c 100644 --- a/app/models/course_activity.rb +++ b/app/models/course_activity.rb @@ -15,8 +15,8 @@ class CourseActivity < ActiveRecord::Base user_activity.save else user_activity = UserActivity.new - user_activity.act_id = self.id - user_activity.act_type = self.class.to_s + user_activity.act_id = self.course_act_id + user_activity.act_type = self.course_act_type user_activity.container_type = "Course" user_activity.container_id = self.course_id user_activity.save diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb index 5d8de8e3a..b7fc5e4c2 100644 --- a/app/models/forge_activity.rb +++ b/app/models/forge_activity.rb @@ -30,8 +30,8 @@ class ForgeActivity < ActiveRecord::Base user_activity.save else user_activity = UserActivity.new - user_activity.act_id = self.id - user_activity.act_type = self.class.to_s + user_activity.act_id = self.forge_act_id + user_activity.act_type = self.forge_act_type user_activity.container_type = "Project" user_activity.container_id = self.project_id user_activity.save diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 40b65f9f9..6013fc453 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -13,7 +13,7 @@ <%= link_to "作业", user_homeworks_user_path(User.current.id), :class => "homepageWhite f16"%> diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 446b4876c..d5a9aacad 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -1,11 +1,11 @@