diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 178782da3..04b5ad89d 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -486,6 +486,20 @@ module CoursesHelper
term
end
+ def course_in_current_or_next_term course
+ is_current_term = false
+ is_next_term = false
+ if course.time == Time.now.year && course.term == cur_course_term
+ is_current_term = true
+ end
+ if cur_course_term == "秋季学期" && course.time == (Time.now.year + 1) && course.term == "春季学期"
+ is_next_term = true
+ elsif cur_course_term == "春季学期" && course.time == Time.now.year && course.term == "秋季学期"
+ is_next_term = true
+ end
+ is_current_term || is_next_term
+ end
+
#获取课程动态
def get_course_activity courses, activities
@course_ids=activities.keys()
diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index f3be6e904..d51606d90 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -47,7 +47,7 @@ module FilesHelper
def courses_check_box_tags(name,courses,current_course,attachment)
s = ''
courses.each do |course|
- if !(attachment.container_type && attachment.container_id == course.id) && is_course_teacher(User.current,course)
+ if !(attachment.container_type && attachment.container_id == course.id) && is_course_teacher(User.current,course) && course_in_current_or_next_term(course)
s << " [#{get_course_term course}]
"
end
end