Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/models/user_extension.rb

@@ -1,6 +1,6 @@
 class UserExtension < ApplicationRecord
   # identity 0: 教师教授 1: 学生, 2: 专业人士, 3: 开发者
-  enum identity: { teacher: 0, student: 1, professional: 2, developer: 3 }
+  enum identity: { teacher: 0, student: 1, professional: 2, developer: 3, cnmooc: 4, unselect: -1 }
 
   belongs_to :user, touch: true
   belongs_to :school, optional: true

public/react/src/modules/courses/busyWork/common/TabRightComponents.js

@@ -63,7 +63,7 @@ class TabRightComponents extends Component{
           })
         }
       }else {
-        this.props.slowDownload(url)
+        this.props.slowDownload(url);
         // this.props.showNotification(`正在下载中`);
         // window.open("/api"+url, '_blank');
       }

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -1031,8 +1031,9 @@ class Listofworksstudentone extends Component {
 		// console.log(this.props);
 		// console.log(this.props.isAdmin())
 		this.student();
-		console.log("Listofworksstudentone---------------");
-		console.log(this.props);
+		// console.log("Listofworksstudentone---------------");
+		// console.log(this.props);
+		// console.log(JSON.stringify(this.props));
 	}
 	isupdatas = () => {
 		var homeworkid = this.props.match.params.homeworkid;
@@ -2475,8 +2476,7 @@ class Listofworksstudentone extends Component {
 					})
 				}
 			}else {
-				this.props.showNotification(`正在下载中`);
-				window.open("/api"+url, '_blank');
+				this.props.slowDownload(url);
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -2498,8 +2498,9 @@ class Listofworksstudentone extends Component {
 
 	 let course_is_end = this.props.current_user&&this.props.current_user.course_is_end;
 
-	 console.log("Listofworksstudentone+++++++++");
-	 console.log(this.props);
+	 // console.log("Listofworksstudentone+++++++++");
+	 // console.log(this.props);
+	 // console.log(JSON.stringify(this.props));
 		return (
 			this.props.isAdmin() === true ?
 				(

public/react/src/modules/page/MainContent.js

@@ -100,6 +100,9 @@ class MainContent extends Component {
 								vnc_url={vnc_url}
 								{...this.props}
 							></VNCContainer>
+							<div id="actionView" className="-layout-h -center -bg-grey-90 -grey-20 -bg-darkblack" style={{height:'48px'}}>
+								<ActionView onRunCodeTest={onRunCodeTest} {...this.props}></ActionView>
+							</div>
 						</CodeRepositoryViewContainer>
 						:
 						<React.Fragment>