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

app/controllers/graduation_topics_controller.rb

@@ -140,8 +140,8 @@ class GraduationTopicsController < ApplicationController
         update_graduation_topic_status
 
         # 拒绝后将该学生移动到未分班中
-        student_member = @course.course_members.where(:user_id => student_graduation_topic.user_id).first
+        # student_member = @course.course_members.where(:user_id => student_graduation_topic.user_id).first
-        student_member.update_attributes(:course_group_id => 0) if student_member.present?
+        # student_member.update_attributes(:course_group_id => 0) if student_member.present?
 
         student_graduation_topic.tidings.update_all(:status => 1)
         Tiding.create(:user_id => student_graduation_topic.user_id, :trigger_user_id => current_user.id,

app/controllers/hacks_controller.rb

@@ -194,7 +194,7 @@ class HacksController < ApplicationController
   end
 
   def hack_params
-    params.require(:hack).permit(:name, :description, :difficult, :category, :open_or_not, :time_limit, :score, :sub_discipline_id)
+    params.require(:hack).permit(:name, :description, :difficult, :open_or_not, :time_limit, :score, :sub_discipline_id)
   end
 
   def item_params

public/react/src/modules/testpaper/Testpaperlibrary.js

@@ -133,16 +133,18 @@ class Testpaperlibrary extends Component {
 	callback = (key) => {
 		this.setState({
 			defaultActiveKey: key,
-			difficulty:null
+			difficulty:null,
+			keywords:null,
+			page:1,
 		})
 		var data={
-			page:this.state.page,
+			page:1,
 			discipline_id:this.state.discipline_id,
 			sub_discipline_id:this.state.sub_discipline_id,
 			tag_discipline_id:this.state.tag_discipline_id,
 			public: key,
-			difficulty: this.state.difficulty,
+			difficulty:null,
-			keywords: 1,
+			keywords: null,
 			per_page:10,
 		}
 		this.getdata(data);

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

@@ -382,6 +382,7 @@ class Challengesjupyter extends Component {
 				setTimeout(()=>{
 					this.setState({
 						jupyter_url :response.data.url,
+						jupyter_port:response.data.port,
 						booljupyterurls:true,
 					})
 				},500);

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

@@ -204,7 +204,7 @@ export const saveJupyterTpi = () => {
         payload: false
       });
     });
-    }, 500)
+    }, 800)
 
   }
 }