diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 359661d4b..db6ae7b57 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -354,7 +354,7 @@ class ApplicationController < ActionController::Base logger.info("--uri_exec: .....res is #{res}") JSON.parse(res) rescue Exception => e - uid_logger("--uri_exec: exception #{e.message}") + uid_logger_error("--uri_exec: exception #{e.message}") raise Educoder::TipException.new("实训平台繁忙(繁忙等级:84)") end end diff --git a/app/models/challenge.rb b/app/models/challenge.rb index 8e4d2ae42..adb54fae9 100644 --- a/app/models/challenge.rb +++ b/app/models/challenge.rb @@ -1,7 +1,6 @@ class Challenge < ApplicationRecord # difficulty: 关卡难度: 1.简单 2.中等 3.困难 # show_type: 效果展示:-1.无效果 1.图片 2.apk/exe 3.txt 4.html 5.mp3 6.mp4 - default_scope { order("challenges.position asc") } belongs_to :shixun, :touch => true, counter_cache: true belongs_to :user diff --git a/app/models/shixun.rb b/app/models/shixun.rb index 1839edf93..81b444c0a 100644 --- a/app/models/shixun.rb +++ b/app/models/shixun.rb @@ -5,7 +5,7 @@ class Shixun < ApplicationRecord # hide_code: 隐藏代码窗口 # code_hidden: 隐藏代码目录 # task_pass: 跳关 - has_many :challenges, dependent: :destroy + has_many :challenges, -> {order("challenges.position asc")}, dependent: :destroy has_many :challenge_tags, through: :challenges has_many :myshixuns, :dependent => :destroy has_many :shixun_members, dependent: :destroy diff --git a/public/react/src/modules/courses/exercise/new/NullDisplay.js b/public/react/src/modules/courses/exercise/new/NullDisplay.js index 079b1194f..b9bd893f9 100644 --- a/public/react/src/modules/courses/exercise/new/NullDisplay.js +++ b/public/react/src/modules/courses/exercise/new/NullDisplay.js @@ -103,14 +103,14 @@ class NullDisplay extends Component{ */}
{ - standard_answer.map((answers, index) => { - return
- 答案(填空{index+1}): + standard_answer.map((answers, _index) => { + return
+ 答案(填空{_index+1}):
{ answers.answer_text.map((item, itemIndex) => { return })} {/* {item} */} diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index dc96c211f..86789b8a2 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -554,9 +554,9 @@ class CoursesNew extends Component { {getFieldDecorator("period", { rules:[{ - required:true, + required:false, pattern: new RegExp(/^[0-9]\d*$/, "g"), - message: '不能小于0' + message: '' }], getValueFromEvent: (event) => { return event.target.value.replace(/\D/g,'') @@ -573,9 +573,9 @@ class CoursesNew extends Component { {getFieldDecorator("credit", { rules:[{ - required:true, + required:false, pattern: new RegExp(/^[0-9]\d*$/, "g"), - message: '不能小于0' + message: '' }], getValueFromEvent: (event) => { return event.target.value.replace(/\D/g,'')