From 98c5bcca6e3b200e7901faa9c8cfe30000492753 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Sat, 13 Apr 2019 18:26:07 +0800
Subject: [PATCH] local to shixun

---
 app/controllers/welcome_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 06602a5c..00bab5b6 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -73,7 +73,7 @@ class WelcomeController < ApplicationController
             if shixun.challenges.present?
               shixun.challenges.each do |challenge|
                 new_challenge = LocalChallenge.new
-                new_challenge.attributes = challenge.attributes.dup.except("id","shixun_id","user_id")
+                new_challenge.attributes = challenge.attributes.dup.except("id","shixun_id","user_id", "test_set_score")
                 new_challenge.local_shixun_id = local_shixun.id
                 new_challenge.save!
                 # 评测题，选择题暂时不考虑
@@ -109,6 +109,7 @@ class WelcomeController < ApplicationController
 
   def local_to_shixun
     ActiveRecord::Base.transaction do
+      shixun_list = []
       LocalShixun.find_each do |local_shixun|
         identifier = generate_identifier
         shixun = Shixun.create!(name: local_shixun.name, description: local_shixun.description, user_id: User.current.id,
@@ -177,8 +178,9 @@ class WelcomeController < ApplicationController
             end
           end
         end
-        render :json => {status: 0, message: "success", identifier: shixun.identifier}
+        shixun_list << shixun.identifier
       end
+      render :json => {status: 0, message: "success", identifier: shixun_list}
     end
   end