Merge branch 'dev_aliyun' into dev_tj

merge aliyun

db/migrate/20191219120819_modify_description_for_hacks.rb

@@ -0,0 +1,10 @@
+class ModifyDescriptionForHacks < ActiveRecord::Migration[5.2]
+  def change
+    change_column :hacks, :description, :longtext
+    change_column :hack_codes, :code, :longtext
+    change_column :hack_user_lastest_codes, :code, :longtext
+    change_column :hack_user_codes, :code, :longtext
+    change_column :hack_user_debugs, :code, :longtext
+
+  end
+end

public/react/src/modules/tpm/TPMBanner.js

@@ -109,6 +109,8 @@ class TPMBanner extends Component {
     if (prevProps != this.props) {
       let shixunopenprocess=window.localStorage.shixunopenprocess;
       let openopenpublictype=window.localStorage.openopenpublictype;
+      if(this.props.status===0&&this.props.openknows===false){
+
         if(this.props.shixunsDetails&&this.props.shixunsDetails.shixun_status === 0 && this.props.identity < 5){
           if(shixunopenprocess===undefined||shixunopenprocess===false){
             this.setState({
@@ -120,7 +122,15 @@ class TPMBanner extends Component {
             })
           }
         }
+      }else{
+        this.setState({
+          openknow:false
+        })
+      }
+
 
+
+      if(this.props.public===0&&this.props.status>1&&this.props.openknows===false){
         if(this.props.shixunsDetails&&this.props.shixunsDetails.shixun_status === 2 && this.props.shixunsDetails&&this.props.shixunsDetails.public===0 && this.props.identity < 5){
           if(openopenpublictype===undefined||openopenpublictype===false){
             this.setState({
@@ -132,6 +142,12 @@ class TPMBanner extends Component {
             })
           }
         }
+      }else{
+        this.setState({
+          openshowpublictype:false
+        })
+      }
+
       
     }
   }
@@ -779,8 +795,8 @@ class TPMBanner extends Component {
     };
     //
     // console.log(this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter)
-    console.log(this.props)
+    // console.log(this.props)
-    console.log(this.state)
+    // console.log(this.state)
     return (
 
       shixunsDetails === undefined ? "" :

public/react/src/modules/tpm/TPMsettings/Shixuninformation.js

@@ -50,12 +50,17 @@ class Shixuninformation extends Component {
   }
 
   componentDidMount() {
+    let query=this.props.location.search
+    const types = query.split('?edit=')
+    if(types[1]==="1"){
       let anchorElement = document.getElementById("newcourseContentMD");
       if(anchorElement){
         this.scrollToAnchor("newcourseContentMD");
       }
     }
 
+  }
+
   componentDidUpdate(prevProps, prevState) {
     if (prevProps.data != this.props.data) {
 

public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js

@@ -407,10 +407,10 @@ class Challenges extends Component {
                 <span className="font-16 fl">简介</span>
 
                 {this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status < 3 ?
-                  <Link to={"/shixuns/" + id + "/settings"} className="fr color-blue font-14">
+                  <a href={"/shixuns/" + id + "/settings?edit=1"} className="fr color-blue font-14">
                   {/*<img src={getImageUrl("images/educoder/icon/edit.svg")} className="fl mt3 ml2" />*/}
                   编辑
-                </Link>:""}
+                </a>:""}
                 {this.props.user && this.props.user.main_site === true ?
                   this.props.identity < 5?<a className="fr font-14 color-blue mr20" href="/forums/2943"
                      target="_blank">实训制作指南</a> : "":""}

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -227,10 +227,10 @@ class Challengesjupyter extends Component {
 						<div className={"shixunjianjie"}>
 							<span className="font-16 fl">简介</span>
 							<Tooltip placement="bottom" title={"编辑"}>
-								<Link style={{ display: this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status < 3 ? "block" : 'none' }}
+								<a style={{ display: this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status < 3 ? "block" : 'none' }}
-									 to={"/shixuns/" + id + "/settings?edit=1"} className="fr color-blue font-14">
+									 href={"/shixuns/" + id + "/settings?edit=1"} className="fr color-blue font-14">
 									编辑
-								</Link>
+								</a>
 							</Tooltip>
 						</div>
 						{this.state.opentitletype===true?<style>

public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js

@@ -330,6 +330,7 @@ class Collaborators extends Component {
       });
       this.updatacomponentDiddata();
       this.props.showNotification(response.data.message);
+      // window.location.reload();
     }).catch((error) => {
       console.log(error)
     });
@@ -530,7 +531,7 @@ class Collaborators extends Component {
                   {
                     Collaboratorslist.length === 0 ? "" : Collaboratorslist.map((item, key) => {
                       return (
-                        <Radio key={key} style={radioStyle} value={item.user_id}
+                        <Radio key={key} style={radioStyle} value={item.user_id} defaultChecked={false}
                                onClick={() => this.addadminredio(item.user_id)}>{item.name}</Radio>
                       )
                     })