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

app/controllers/games_controller.rb

@@ -311,7 +311,7 @@ class GamesController < ApplicationController
           # 扣除总分计算
           @game.update_attributes!(:answer_open => 1, :answer_deduction => 100)
         end
-        @challenge_answers = @challenge.challenge_chooses
+        @challenge_chooses = @challenge.challenge_chooses
       rescue Exception => e
         uid_logger_error("#######金币扣除异常: #{e.message}")
         raise ActiveRecord::Rollback
@@ -903,7 +903,7 @@ class GamesController < ApplicationController
       end
       # actual_output为空表示暂时没有评测答题，不允许查看
       actual_output = output.try(:actual_output).try(:strip)
-      has_answer << choose.answer  if choose.answer.present?
+      #has_answer << choose.answer  if choose.answer.present?
       # 标准答案处理，错误的不让用户查看，用-1替代
       standard_answer = (actual_output.blank? || !output.try(:result)) ? -1 : choose.standard_answer
       result = output.try(:result)
@@ -914,7 +914,7 @@ class GamesController < ApplicationController
       @chooses << sin_choose
       test_sets << sin_test_set
     end
-    @has_answer = has_answer.present?
+    @has_answer = true # 选择题永远都有答案
     @choose_test_cases = {:had_submmit => had_submmit, :challenge_chooses_count => challenge_chooses_count,
                           :choose_correct_num => choose_correct_num, :test_sets => test_sets}
   end