diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 49341d58c..ca409c55f 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -520,6 +520,11 @@ class CoursesController < ApplicationController activities[board.course_id]+=board.messages.where("updated_on>?", date_from).count end + #news + News.where(course_id: @course_ids).where("created_on>?",date_from).each do |news| + activities[news.course_id]+=1 + end + #feedbackc_count JournalsForMessage.where(jour_id: @course_ids, jour_type: Course).each do |jourformess| activities[jourformess.jour_id]+=1 diff --git a/db/migrate/20140606027403_migrate_course_journals.rb b/db/migrate/20140606027403_migrate_course_journals.rb index 40c57e815..4a13ef38d 100644 --- a/db/migrate/20140606027403_migrate_course_journals.rb +++ b/db/migrate/20140606027403_migrate_course_journals.rb @@ -8,6 +8,9 @@ class MigrateCourseJournals < ActiveRecord::Migration journal.jour_id = project.course_extra.id journal.save end + # 将自动设置的更新日期还原 + sql = ActiveRecord::Base.connection() + sql.insert "update journals_for_messages set updated_on=created_on where jour_type='Course'" end end diff --git a/db/schema.rb b/db/schema.rb index 6481ace3b..18a3fb841 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 => 20140618105213) do +ActiveRecord::Schema.define(:version => 20140618105214) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false