From 3083f683b915de96e149c8a26fa61f6390170eaf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 Nov 2015 21:14:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E9=A1=BA=E5=BA=8F=E4=B9=B1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb   | 6 +++---
 app/views/exercise/_show_MC.html.erb     | 2 +-
 app/views/exercise/_show_MCQ.html.erb    | 2 +-
 app/views/exercise/_show_single.html.erb | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index cd1f32fa9..c8e5bf27c 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -275,12 +275,12 @@ class ExerciseController < ApplicationController
     @exercise = @exercise_question.exercise
 
     if @exercise_question.question_type == 1
-      ExerciseQuestion.where("question_number<? and question_type=?",params[:quest_num].to_i, 1).update_all(" question_number = question_number - 1")
+      ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 1).update_all(" question_number = question_number - 1")
       #@exercise.exercise_questions.where("question_number > #{params[:quest_num].to_i} and question_type == 1").update_all(" question_number = question_number + 1")
     elsif @exercise_question.question_type == 2
-      ExerciseQuestion.where("question_number<? and question_type=?",params[:quest_num].to_i, 2).update_all(" question_number = question_number - 1")
+      ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 2).update_all(" question_number = question_number - 1")
     else
-      ExerciseQuestion.where("question_number<? and question_type=?",params[:quest_num].to_i, 3).update_all(" question_number = question_number - 1")
+      ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 3).update_all(" question_number = question_number - 1")
     end
     # @exercise_question_num = params[:quest_num].to_i
     # @exercise_questions.question_number = params[:quest_num].to_i - 1
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index b932eac1e..6f3081e5f 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -4,7 +4,7 @@
     <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
   </div>
 
-  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
               method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
   <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
   <a class='ur_icon_add' title='向下插入' id="add_mc_<%=exercise_question.id%>" onclick="dismiss('mc',<%=exercise_question.id%>);insert_MC('mc',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index 2a91afab5..e4bdad3f1 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -3,7 +3,7 @@
     <%= exercise_question.question_title %>
     <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
   </div>
-  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
               method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
   <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
   <a class='ur_icon_add' title='向下插入' id="add_mcq_<%=exercise_question.id%>" onclick="dismiss('mcq',<%=exercise_question.id%>);insert_MCQ('mcq',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb
index 5f36a931e..8223f98fd 100644
--- a/app/views/exercise/_show_single.html.erb
+++ b/app/views/exercise/_show_single.html.erb
@@ -2,8 +2,8 @@
   <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
     <%= exercise_question.question_title %>
   </div>
-  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),
-              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true,  :class => "ur_icon_de") %>
   <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
   <a class='ur_icon_add' title='向下插入' id="add_single_<%=exercise_question.id%>" onclick="dismiss('single',<%=exercise_question.id%>);insert_SINGLE('single',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
   <div class="cl"></div>