diff --git a/app/views/homework_commons/index.json.jbuilder b/app/views/homework_commons/index.json.jbuilder index db3603746..b80b41b8f 100644 --- a/app/views/homework_commons/index.json.jbuilder +++ b/app/views/homework_commons/index.json.jbuilder @@ -26,19 +26,17 @@ json.homeworks @homework_commons.each do |homework| json.uncommit_count studentwork_count homework, 0, @member end - if @user_course_identity < Course::STUDENT - if homework.homework_type == "practice" - json.shixun_identifier homework.shixuns.take.try(:identifier) - json.shixun_status homework.shixuns.take.try(:status).to_i - end - elsif @user_course_identity == Course::STUDENT + if homework.homework_type == "practice" + json.shixun_identifier homework.shixuns.take.try(:identifier) + json.shixun_status homework.shixuns.take.try(:status).to_i + end + if @user_course_identity == Course::STUDENT if homework.homework_type == "practice" shixun = homework.shixuns.take # json.challenge_count homework.shixuns.first.try(:challenges_count).to_i current_myshixun = homework.user_work(@user.id).try(:myshixun) myshixun = current_myshixun ? current_myshixun : shixun.myshixuns.find_by(user_id: @user.id) # json.game_count current_myshixun ? current_myshixun.exec_count : 0 - json.shixun_status shixun.try(:status).to_i json.task_operation task_operation_url(myshixun, shixun) else work = homework.user_work(@user.id)