diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 83c4ded65..b98073d7c 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -110,6 +110,8 @@ module CoursesHelper
course.course_groups_count
when "announcement"
course.informs.count
+ when "online_learning"
+ course.subject.stage_shixuns_count
end
end
diff --git a/app/models/subject.rb b/app/models/subject.rb
index 4b7f4dbcd..6ecb5ed18 100644
--- a/app/models/subject.rb
+++ b/app/models/subject.rb
@@ -46,8 +46,8 @@ class Subject < ApplicationRecord
# 挑战过路径的成员数(金课统计去重后的报名人数)
def member_count
- excellent && CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).uniq.length > shixuns.pluck(:myshixuns_count).sum ?
- CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).uniq.length : shixuns.pluck(:myshixuns_count).sum
+ excellent && CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).length > shixuns.pluck(:myshixuns_count).sum ?
+ CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).length : shixuns.pluck(:myshixuns_count).sum
end
def all_score
diff --git a/public/react/src/App.js b/public/react/src/App.js
index 123755317..e71185988 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -345,8 +345,17 @@ class App extends Component {
})
}
}
+ disableVideoContextMenu = () => {
+ window.$( "body" ).on( "mousedown", "video", function() {
+ if(event.which === 3) {
+ window.$('video').bind('contextmenu',function () { return false; });
+ } else {
+ window.$('video').unbind('contextmenu');
+ }
+ });
+ }
componentDidMount() {
-
+ this.disableVideoContextMenu();
// force an update if the URL changes
history.listen(() => {
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index 15f57f130..21ac26727 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -655,7 +655,10 @@ class CoursesBanner extends Component {
this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers")} className={"pointer"}>
教师 {coursedata.teacher_count}
- this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students")} className={"pointer"}>
+ this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students"):"":()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students")}
+ >
学生 {coursedata.student_count}
{coursedata.credit===null?"":