diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 72e9c1728..b2f87ba72 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -56,6 +56,7 @@ class CoursesController < ApplicationController end end + #更新课程信息 def update @course.safe_attributes = params[:course] @course.class_period = params[:class_period] diff --git a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb index c719629ae..95bda9bb0 100644 --- a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb +++ b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb @@ -118,7 +118,7 @@ module Redmine scope = scope.visible(user1, options) elsif provider_options.has_key?(:func) && provider_options[:func].eql?('memos') scope = scope - elsif event_type.to_s == 'course_files' + elsif event_type.to_s == 'course_files' || event_type.to_s == 'course_journals_for_messages' || event_type.to_s == 'course_messages' scope = scope else ActiveSupport::Deprecation.warn "acts_as_activity_provider with implicit :permission option is deprecated. Add a visible scope to the #{self.name} model or use explicit :permission option." diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb index 0204979e9..0793ff88f 100644 --- a/lib/redmine/activity/fetcher.rb +++ b/lib/redmine/activity/fetcher.rb @@ -103,7 +103,9 @@ module Redmine @scope.each do |event_type| constantized_providers(event_type).each do |provider| - e += provider.find_events1(event_type, @user, from, to, @options) + if event_type.to_s != 'course_journals_for_messages' + e += provider.find_events1(event_type, @user, from, to, @options) + end end end