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

5 years ago · 7a23e46d7a
parent 99904fa1f0 0999269bcc
commit 7a23e46d7a
2 changed files with 2 additions and 2 deletions
--- a/app/views/homework_commons/_student_btn_check.json.jbuilder
+++ b/app/views/homework_commons/_student_btn_check.json.jbuilder
@ -5,6 +5,8 @@ if identity == Course::STUDENT
    json.task_operation task_operation_url(myshixun, shixun)
    json.view_report work.work_status > 0
    json.commit_des commit_des_status(work, homework)
+    json.redo_work (homework.end_or_late ? false : student_redo_work(work, homework))
+    json.myshixun_identifier myshixun&.identifier
  else
    json.work_statuses student_work_status(homework, work.user_id, homework.course, work)
  end
--- a/app/views/homework_commons/works_list.json.jbuilder
+++ b/app/views/homework_commons/works_list.json.jbuilder
@ -40,8 +40,6 @@ elsif @user_course_identity == Course::STUDENT
    json.efficiency work_score_format(@work.efficiency, true, @score_open)
    json.eff_score work_score_format(@work.eff_score, true, @score_open)
    json.complete_count @work.myshixun.try(:passed_count)
-    json.redo_work (@homework.end_or_late ? false : student_redo_work(@work, @homework))
-    json.myshixun_identifier @work.myshixun&.identifier
  else
    json.(@work, :id, :work_status, :update_time, :ultimate_score)