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

app/controllers/hacks_controller.rb

@@ -188,10 +188,13 @@ class HacksController < ApplicationController
   def param_update_sets sets, all_sets_id
     delete_set_ids = all_sets_id - sets.map{|set|set[:id]}
     @hack.hack_sets.where(id: delete_set_ids).destroy_all
+    logger.info("#######sets:#{sets}")
     sets.each do |set|
+      logger.info("###set[:id]： #{set[:id]}")
+      logger.info("###all_sets： #{all_sets_id.include?(set[:id])}")
       if all_sets_id.include?(set[:id])
         update_attrs = {input: set[:input], output: set[:output], position: set[:position]}
-        @hack.hack_sets.find_by!(id: set[:id]).update_attributes(update_attrs)
+        @hack.hack_sets.find_by!(id: set[:id]).update_attributes!(update_attrs)
       end
     end
   end

app/decorators/grade_decorator.rb

@@ -33,7 +33,7 @@ module GradeDecorator
       game.present? ? "查看实训“#{game.challenge.shixun.name}”第#{game.challenge.position}关的TA人解答消耗的金币" : ''
     when 'hack' then
       hack = Hack.find_by(id: container_id)
-      game.present? ? "完成了题目解答“#{hack.name}”，获得金币奖励：#{hack.score}" : ''
+      hack.present? ? "完成了题目解答“#{hack.name}”，获得金币奖励：#{hack.score}" : ''
     end
   end
 end

app/decorators/tiding_decorator.rb

@@ -226,7 +226,7 @@ module TidingDecorator
   end
 
   def discuss_content
-    I18n.t(locale_format(container_type, container.parent_id.present?)) % message_content_helper(container.content)
+    I18n.t(locale_format(parent_container_type, container.parent_id.present?)) % message_content_helper(container.content)
   end
 
   def grade_content

config/locales/tidings/zh-CN.yml

@@ -108,7 +108,7 @@
       Issue_end: "赞了你发布的项目Issue：%s"
       Journal_end: "赞了你的回复%s"
     Discuss:
-      Shixun:
+      Challenge:
         true_end: "评论了你的回复：%s"
         false_end: "评论了你发布的实训：%s"
       Hack:

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

@@ -219,7 +219,7 @@ class Challengesjupyter extends Component {
 
 	modifyjupyter=()=>{
 		// this.props.showNotification('实训正在保存中...!');
-
+		setTimeout(() => {
 		let id=this.props.match.params.shixunId;
 		var jupyter_port="";
 		try{
@@ -257,8 +257,10 @@ class Challengesjupyter extends Component {
 			})
 			this.props.showNotification('实训保存失败!');
 		})
-
+		}, 500)
 	}
+
+
 	opentitle=()=>{
 		this.setState({
 			opentitletype:!this.state.opentitletype
@@ -577,7 +579,7 @@ class Challengesjupyter extends Component {
 															<p className="challenbaocuntest" type="upload" >导入</p>
 														</div>
 													</Upload>
-													{/*<button type="button" className="ant-btn deletebuttom chongzhistyles"  onClick={this.handleClickResetTpi}><span>重置实训</span></button>*/}
+													{/*<button type="button" className="ant-btn deletebuttom chongzhistyles"  onClick={this.handleClickResetTpi}><span>重置环境</span></button>*/}
 
 												</div>
 

public/react/src/redux/actions/jupyter.js

@@ -174,7 +174,7 @@ export const changeGetJupyterUrlState = (status) => {
 // 保存 jupyter tpi
 export const saveJupyterTpi = () => {
   return (dispatch, getState) => {
-    
+    setTimeout(() => {
     const { jupyter_tpi_code, jupyter_info }= getState().jupyterReducer;
     // console.log(jupyter_info.myshixun_identifier, jupyter_tpi_code);
     if (!jupyter_info.myshixun_identifier) return;
@@ -182,7 +182,7 @@ export const saveJupyterTpi = () => {
       identifier: jupyter_info.myshixun_identifier,
       jupyter_port: jupyter_tpi_code
     };
-    console.log(params);
+
     fetchSaveJupyterTpi(params).then(res => {
       dispatch({
         type: types.LOADING_STATUS,
@@ -200,6 +200,8 @@ export const saveJupyterTpi = () => {
         payload: false
       });
     });
+    }, 500)
+
   }
 }
 // 改变当前页数