修正课程留言动态引起的首页错误
This commit is contained in:
parent
8a274981ce
commit
b2756650cf
|
@ -56,6 +56,7 @@ class CoursesController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
#更新课程信息
|
||||||
def update
|
def update
|
||||||
@course.safe_attributes = params[:course]
|
@course.safe_attributes = params[:course]
|
||||||
@course.class_period = params[:class_period]
|
@course.class_period = params[:class_period]
|
||||||
|
|
|
@ -118,7 +118,7 @@ module Redmine
|
||||||
scope = scope.visible(user1, options)
|
scope = scope.visible(user1, options)
|
||||||
elsif provider_options.has_key?(:func) && provider_options[:func].eql?('memos')
|
elsif provider_options.has_key?(:func) && provider_options[:func].eql?('memos')
|
||||||
scope = scope
|
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
|
scope = scope
|
||||||
else
|
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."
|
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."
|
||||||
|
|
|
@ -103,7 +103,9 @@ module Redmine
|
||||||
|
|
||||||
@scope.each do |event_type|
|
@scope.each do |event_type|
|
||||||
constantized_providers(event_type).each do |provider|
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue