jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
huang 2015-06-19 14:12:27 +08:00
parent e05a66e8fd fa3b216e0f
commit 45a759f117
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/courses_controller.rb
View File

@ -695,12 +695,13 @@ class CoursesController < ApplicationController
# 显示老师和助教的活动
# @authors = searchTeacherAndAssistant(@course)
@authors = course_all_member(@course)
Dir.glob("#{Rails.root}/app/models/*.rb").sort.each { |file| require file }
#TODO 貌似删除操作不会更新缓存 还是先不用缓存吧
# Dir.glob("#{Rails.root}/app/models/*.rb").sort.each { |file| require file }
events = []
key = "course_events_#{@course.id}".to_sym
if Rails.env.production? && Setting.course_cahce_enabled?
events = Rails.cache.read(key) || []
end
# key = "course_events_#{@course.id}".to_sym
# if Rails.env.production? && Setting.course_cahce_enabled?
# events = Rails.cache.read(key) || []
# end
if events.empty?
@authors.each do |author|
@activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
@ -716,7 +717,7 @@ class CoursesController < ApplicationController
events += @activity.events(@days, @course.created_at, :is_public => 1)
end
end
Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled?
# Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled?
end
else
# @author = @course.teacher