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

app/controllers/challenges_controller.rb

@@ -5,8 +5,8 @@ class ChallengesController < ApplicationController
   before_action :find_challenge, only: [:edit, :show, :update, :create_choose_question, :index_down, :index_up,
                                         :edit_choose_question, :show_choose_question, :destroy_challenge_choose,
                                         :update_choose_question, :destroy, :crud_answer, :answer]
-  # before_action :allowed, except: [:index, :show, :edit_choose_question, :edit]
+  # 权限控制
-
+  before_action :allowed, except: [:index]
 
   include ShixunsHelper
   include ChallengesHelper
@@ -296,8 +296,7 @@ class ChallengesController < ApplicationController
   end
 
   def allowed
-    # 实训为发布前,除实训的管理者外,其他人都不人都不允许访问
+    unless current_user.manager_of_shixun?(@shixun)
-    if !current_user.manager_of_shixun?(@shixun) && (@shixun.status < 1 || @shixun.hidden == 1)
       raise Educoder::TipException.new(403, "..")
     end
   end

app/controllers/exercise_questions_controller.rb

@@ -427,15 +427,6 @@ class ExerciseQuestionsController < ApplicationController
         delete_answer = question_choices.find_by(choice_position: choice_d_id)
         left_choices = question_choices.where("choice_position > ? ",choice_d_id)
         left_choices.update_all("choice_position = choice_position - 1") if left_choices
-        # delete_answer = question_choices.find_choice_custom("choice_position",choice_d_id).first
-        #
-        # left_choice = question_choices.left_choice_choose("choice_position",choice_d_id)
-        # if left_choice.present?
-        #   left_choice.each do |p|
-        #     p.choice_position -= 1
-        #     p.save
-        #   end
-        # end
         if delete_answer.destroy
           normal_status(0, "答案删除成功！")
         else
@@ -456,13 +447,6 @@ class ExerciseQuestionsController < ApplicationController
         exercise_questions = @exercise.exercise_questions
         left_questions = exercise_questions.where("question_number > ?", question_d_id)
         left_questions.update_all("question_number = question_number - 1") if left_questions
-        # left_question = exercise_questions.left_question_choose("question_number",question_d_id)
-        # if left_question.present?
-        #   left_question.each do |q|
-        #     q.question_number -= 1
-        #     q.save
-        #   end
-        # end
         if @exercise_question.destroy
           normal_status(0, "问题删除成功！")
         else

app/controllers/poll_questions_controller.rb

@@ -160,14 +160,6 @@ class PollQuestionsController < ApplicationController
         left_answers =  poll_answers.where("answer_position > ?",answer_d_id)
         left_answers.update_all("answer_position = answer_position - 1") if left_answers
 
-        # delete_answer = poll_answers.find_answer_by_custom("answer_position",answer_d_id).first
-        # left_answer = poll_answers.left_answer_choose("answer_position",answer_d_id)
-        # if left_answer.present?
-        #   left_answer.each do |p|
-        #     p.answer_position -= 1
-        #     p.save
-        #   end
-        # end
         if delete_answer.destroy
           normal_status(0, "答案删除成功！")
         else

app/controllers/shixuns_controller.rb

@@ -557,7 +557,7 @@ class ShixunsController < ApplicationController
 					# HomeworksService.new.update_myshixun_work_status myshixun
 					UpdateMyshixunWorkStatusJob.perform_later(myshixun.id)
 
-					@current_task = myshixun.current_task
+					@current_task = myshixun.current_task(myshixun.games)
 					uid_logger("## shixun exec: myshixun id is #{myshixun.id}")
 				rescue Exception => e
 					uid_logger_error(e.message)