diff --git a/app/controllers/question_banks_controller.rb b/app/controllers/question_banks_controller.rb index e30065d09..76600c6a2 100644 --- a/app/controllers/question_banks_controller.rb +++ b/app/controllers/question_banks_controller.rb @@ -147,21 +147,22 @@ class QuestionBanksController < ApplicationController new_homework.homework_detail_group.base_on_project = homework.base_on_project end # 附件 - homework.attachments.try(:each) do |attachment| - att = attachment.copy - att.container_id = nil - att.container_type = nil - att.author_id = homework.user_id - att.copy_from = attachment.id - att.save - new_homework.attachments << att - end - - if new_homework.save + logger.info("######attachments: #{homework.attachments.count}") + if new_homework.save! + homework.attachments.try(:each) do |attachment| + att = attachment.copy + att.container_id = nil + att.container_type = nil + att.author_id = homework.user_id + att.copy_from = attachment.id + att.save! + new_homework.attachments << att + end + logger.info("######new_homework.attachments: #{new_homework.attachments.count}") new_homework_detail_manual.save if new_homework_detail_manual new_homework.homework_detail_group.save if new_homework.homework_detail_group HomeworksService.new.create_works_list(new_homework, course) - homework.update_column(:quotes, homework.quotes+1) + homework.update_column(:quotes, homework.quotes + 1) end new_homework end diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index be4448a92..9edb6bb9d 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -830,8 +830,6 @@ private def is_shixun_reset?(games, min_challenges, current_myshixun) # 用户在申请发布之前,是否玩过实训 TODO: 重置的字段应该迁移到myshixuns表比较合适 modify_shixun = ShixunModify.exists?(:myshixun_id => current_myshixun.id, :shixun_id => @shixun.id, :status => 1) - games.size != min_challenges.size || - games.map(&:challenge_id) != min_challenges.map{|challenge| challenge.first} || - modify_shixun + games.size != min_challenges.size || modify_shixun end end