Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into topic_bank

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
 

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

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(() => {

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -655,7 +655,10 @@ class CoursesBanner extends Component {
 													<Breadcrumb.Item onClick={()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers")} className={"pointer"}>
 														<span className="color-grey-c font-16"><span className={"mr10"}>教师</span>  <span className={"mr10"}>{coursedata.teacher_count}</span></span>
 													</Breadcrumb.Item>
-													<Breadcrumb.Item onClick={()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students")} className={"pointer"}>
+													<Breadcrumb.Item
+														className={excellent===true&&coursedata.course_end === true?this.props.isAdminOrTeacher()===true?"pointer":"":"pointer"}
+														onClick={excellent===true&&coursedata.course_end === true?this.props.isAdminOrTeacher()===true?()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students"):"":()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students")}
+													>
 														<span className="color-grey-c font-16"><span className={"mr10 ml10"}>学生</span>  <span className={"mr10"}>{coursedata.student_count}</span></span>
 													</Breadcrumb.Item>
 													<Breadcrumb.Item>{coursedata.credit===null?"":