Merge branch 'dev_aliyun' into develop

app/models/course_video.rb

@@ -3,6 +3,6 @@ class CourseVideo < ApplicationRecord
   belongs_to :video, optional: true
   belongs_to :user, optional: true
 
-  validates :title, length: { maximum: 60, too_long: "不能超过60个字符" }
+  validates :title, length: { maximum: 60, too_long: "不能超过60个字符" }, allow_blank: true
-  validates :link, format: { with: CustomRegexp::URL, message: "必须为网址超链接" }
+  validates :link, format: { with: CustomRegexp::URL, message: "必须为网址超链接" }, allow_blank: true
 end

public/react/src/modules/courses/Video/VideoIndex.js

@@ -240,7 +240,7 @@ class VideoIndex extends Component{
     const { coursesId , videoId }=this.props.match.params;
 
     const {course_identity} = this.props.coursedata;
-    const flag = parseInt(course_identity) < 4;
+    const flag = parseInt(course_identity) < 5;
     const newOperation = flag;
     const new_upload = flag && (is_teacher && this.props.checkIfProfessionalCertification());
     return(