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

app/controllers/exercise_banks_controller.rb

@@ -74,7 +74,7 @@ class ExerciseBanksController < ApplicationController
 
   #判断实训是否已选择
   def commit_shixun_present
-    question_shixun_ids = @exercise.exercise_bank_questions.pluck(:shixun_id).reject(&:blank?)
+    question_shixun_ids = @bank.exercise_bank_questions.pluck(:shixun_id).reject(&:blank?)
     shixun_id = params[:shixun_id]
     @shixun = Shixun.find_by(id: shixun_id)
     if shixun_id.present? && question_shixun_ids.include?(shixun_id)

app/controllers/games_controller.rb

@@ -59,7 +59,7 @@ class GamesController < ApplicationController
                   record_onsume_time: record_onsume_time, prev_game: prev_game, next_game: next_game,
                   praise_count: praise_count, user_praise: user_praise, time_limit: time_limit,
                   tomcat_url: edu_setting('cloud_tomcat_php'), is_teacher: is_teacher,
-                  myshixun_manager: myshixun_manager}
+                  myshixun_manager: myshixun_manager, git_url: (@shixun.vnc ? repo_url(@myshixun.repo_path) : "")}
     if @shixun.vnc
       begin
         shixun_tomcat = edu_setting('cloud_bridge')

app/controllers/homework_banks_controller.rb

@@ -57,8 +57,8 @@ class HomeworkBanksController < ApplicationController
     tip_exception("description参数不能为空") if params[:homework_bank][:description].blank?
     if @bank.homework_type == 3
       tip_exception("base_on_project参数不能为空") if params[:homework_bank][:base_on_project].nil?
-      tip_exception("min_num参数不能为空") if params[:homework_bank][:min_num].blank?
-      tip_exception("max_num参数不能为空") if params[:homework_bank][:max_num].blank?
+      tip_exception("最小人数不能为空") if params[:homework_bank][:min_num].blank?
+      tip_exception("最大人数参数不能为空") if params[:homework_bank][:max_num].blank?
       tip_exception("最小人数不能小于1") if params[:homework_bank][:min_num].to_i < 1
       tip_exception("最大人数不能小于最小人数") if params[:homework_bank][:max_num].to_i < params[:homework_bank][:min_num].to_i
     end

app/services/users/question_bank_service.rb

@@ -85,7 +85,7 @@ class Users::QuestionBankService
   def custom_sort(relations, sort_by, sort_direction)
     case sort_by
     when 'updated_at' then
-      relations.order("updated_at #{sort_direction}, id desc")
+      relations.order("updated_at #{sort_direction}, id #{sort_direction}")
     when 'name' then
       relations.order("CONVERT(name USING gbk) COLLATE gbk_chinese_ci #{sort_direction}")
     when 'contributor' then

app/views/games/show.json.jbuilder

@@ -1,6 +1,6 @@
 json.(@base_date, :st, :discusses_count, :game_count, :record_onsume_time, :prev_game, :next_game, :praise_count,
     :user_praise, :time_limit, :tomcat_url, :is_teacher, :myshixun_manager, :game, :challenge,
-    :shixun, :myshixun)
+    :shixun, :myshixun, :git_url)
 if @shixun.vnc
   json.vnc_url @vnc_url
 end

app/views/users/question_banks/index.json.jbuilder

@@ -1,6 +1,9 @@
 
 json.count @count
-json.course_list @course_lists, partial: 'users/question_banks/shared/course_list', as: :course_list
+json.course_list @course_lists do |course_list|
+  json.id course_list.id
+  json.name course_list.name
+end
 
 json.question_banks @question_banks do |question_bank|
   json.id question_bank.id

public/react/src/modules/courses/members/studentsList.js

@@ -355,12 +355,12 @@ class studentsList extends Component{
       searchValue: e.target.value
     })
 
-    if (this.timeoutHandler) {
-      clearTimeout(this.timeoutHandler)
-    }
-    this.timeoutHandler = setTimeout(() => {
-      this.fetchAll(1)
-    }, 1200)
+    // if (this.timeoutHandler) {
+    //   clearTimeout(this.timeoutHandler)
+    // }
+    // this.timeoutHandler = setTimeout(() => {
+    //   this.fetchAll(1)
+    // }, 1200)
   }
   onSortTypeChange = (order) => {
     this.setState({ order: order }, () => {