diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index e6a592f51..1187ebafa 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -556,10 +556,19 @@ class GamesController < ApplicationController msg = @game.run_code_message msg.update_attributes(:status => 0, :message => nil) if msg.present? - # 更新时间是为了TPM端显示的更新,退出实训及访问实训的时候会更新 - @myshixun.update_column(:updated_at, Time.now) - + # 更新时间是为了TPM端显示的更新,退出实训及访问实训的时候会更新,如果版本库地址不存在,重新去版本库中找 + myshixuns_update = + if @myshixun.repo_name.nil? + g = Gitlab.client + repo_name = g.project(@myshixun.gpid).path_with_namespace + {repo_name: repo_name} + else + {updated_at: Time.now} + end + logger.info("#############myshixuns_update: ##{myshixuns_update}") + @myshixun.update_attributes!(myshixuns_update) gitUrl = repo_ip_url @myshixun.repo_path + logger.info("#############giturl: ##{gitUrl}") gitUrl = Base64.urlsafe_encode64(gitUrl) diff --git a/public/react/src/modules/courses/exercise/new/SingleDisplay.js b/public/react/src/modules/courses/exercise/new/SingleDisplay.js index 453cce229..b7a1905fc 100644 --- a/public/react/src/modules/courses/exercise/new/SingleDisplay.js +++ b/public/react/src/modules/courses/exercise/new/SingleDisplay.js @@ -54,7 +54,7 @@ class SingleDisplay extends Component{ } render() { let { question_title, question_score, question_type, question_choices, standard_answer, - question_id, question_number, index, displayCount + question_id, question_number, index, displayCount, showActionButton } = this.props; // const { getFieldDecorator } = this.props.form; @@ -70,6 +70,9 @@ class SingleDisplay extends Component{ // const answerTagArray = standard_answer.map((item, index) => { return item == true ? tagArray[index] : -1 }).filter(item => item != -1); let length = 5; const qName = qNameArray[question_type] + + const isPreviewPage = showActionButton == false + return(