diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb
index ef46e47a8..9c6f3c396 100644
--- a/app/views/exercise/_edit_MC.html.erb
+++ b/app/views/exercise/_edit_MC.html.erb
@@ -1,4 +1,4 @@
-<%= form_for("",:class => 'new_or_edit_question',:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
+<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
     <!--编辑单选start-->
     <script type="text/javascript">
         function resetQuestion<%=exercise_question.id%>()
diff --git a/app/views/exercise/_edit_MCQ.html.erb b/app/views/exercise/_edit_MCQ.html.erb
index f68c732e9..0186b3041 100644
--- a/app/views/exercise/_edit_MCQ.html.erb
+++ b/app/views/exercise/_edit_MCQ.html.erb
@@ -1,4 +1,4 @@
-<%= form_for("",:class => 'new_or_edit_question',:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
+<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
     <!--编辑单选start-->
     <script type="text/javascript">
         function resetQuestion<%=exercise_question.id%>()
diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb
index 2978cbc17..9868a4465 100644
--- a/app/views/exercise/_edit_head.html.erb
+++ b/app/views/exercise/_edit_head.html.erb
@@ -1,4 +1,4 @@
-<%= form_for @exercise,:class => 'new_or_edit_question', :remote=>true  do |f| %>
+<%= form_for @exercise, :remote=>true  do |f| %>
     <div class="testContainer">
       <div>
         <input name="exercise[exercise_name]" maxlength="100" id="exercise_name" class="testTitle mb10" type="text" placeholder="测验标题" value="<%=@exercise.exercise_name%>" />
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index 4bb2c31ab..934e51b71 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -148,10 +148,16 @@
 
     function poll_submit()
     {
-        var title = $.trim($("#polls_name_h").html());
-        if(title.length == 0)
-        {
-            alert("测验标题不能为空");
+        var head_form = $("form.edit_exercise");
+        var question_form = $("form.new_exercise_question");
+        <% current_score = get_current_score @exercise %>
+        var score = <%=current_score %>;
+        if(head_form.length > 0){
+            alert("请先保存测验标题及测验基本信息。");
+        } else if(question_form.length > 0) {
+            alert("请先保存正在编辑的题目。");
+        } else if( score < 100) {
+            alert("");
         }
         else{
             $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @exercise,:is_remote => false}) %>');
diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb
index e4e146237..3da0021ce 100644
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@@ -1,5 +1,4 @@
 <%= form_for(ExerciseQuestion.new,
-             :class => 'new_or_edit_question',
              :html => { :multipart => true },
              :url => {:controller => 'exercise',
                       :action => 'create_exercise_question',
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index 3b4002ffa..044ecd629 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -1,5 +1,4 @@
 <%= form_for(ExerciseQuestion.new,
-             :class => 'new_or_edit_question',
              :html => { :multipart => true },
              :url => {:controller => 'exercise',
                       :action => 'create_exercise_question',
diff --git a/app/views/exercise/_new_question.html.erb b/app/views/exercise/_new_question.html.erb
index d41ad1ca7..6148c9bb9 100644
--- a/app/views/exercise/_new_question.html.erb
+++ b/app/views/exercise/_new_question.html.erb
@@ -7,18 +7,33 @@
 
 <script type="text/javascript">
     function add_MC(){
-        $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MC', :locals => {:exercise=>exercise}) %>");
-        $("#poll_questions_title").focus();
+        var forms = $("form.new_exercise_question");
+        if(forms.length > 0){
+            alert("请先保存正在编辑的题目再新建。");
+        } else{
+            $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MC', :locals => {:exercise=>exercise}) %>");
+            $("#poll_questions_title").focus();
+        }
     }
 
     function add_MCQ(){
-        $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MCQ', :locals => {:exercise=>exercise}) %>");
-        $("#poll_questions_title").focus();
+        var forms = $("form.new_exercise_question");
+        if(forms.length > 0){
+            alert("请先保存正在编辑的题目再新建。");
+        } else{
+            $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MCQ', :locals => {:exercise=>exercise}) %>");
+            $("#poll_questions_title").focus();
+        }
     }
 
     function add_single(){
-        $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_single', :locals => {:exercise=>exercise}) %>");
-        $("#poll_questions_title").focus();
+        var forms = $("form.new_exercise_question");
+        if(forms.length > 0){
+            alert("请先保存正在编辑的题目再新建。");
+        } else{
+            $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_single', :locals => {:exercise=>exercise}) %>");
+            $("#poll_questions_title").focus();
+        }
     }
 
 </script>
\ No newline at end of file
diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb
index 06b8939c3..ad5af1937 100644
--- a/app/views/exercise/_new_single.html.erb
+++ b/app/views/exercise/_new_single.html.erb
@@ -1,6 +1,5 @@
 <%= form_for(ExerciseQuestion.new,
              :html => { :multipart => true },
-             :class => 'new_or_edit_question',
              :url => {:controller => 'exercise',
                       :action => 'create_exercise_question',
                       :course_id => @course.id
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index 1c90f6908..21d6ef4bb 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -32,75 +32,80 @@
 
 <script type="text/javascript">
     function insert_MC(quest_type,quest_num,quest_id){
+        var forms = $("form.new_exercise_question");
         if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == "") {
-            <% score =@exercise.exercise_questions.where("question_type=1").last.nil? ? "": @exercise.exercise_questions.where("question_type=1").last.question_score %>
-            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                            '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>{:controller=> 'exercise',:action=>'create_exercise_question',:course_id=>@course.id},:remote=>true) do |f|%>'+
-                            ' <div class="questionContainer" style="width: 680px;"> '+
-                            '<div class="ur_editor_title"> '+
-                            '<label>问题：&nbsp;&nbsp;</label>'+
-                            '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
-                            '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
-                            '<input type="hidden" name="question_type" value="1"/>'+
-                            '<input name="question_title" id="poll_questions_title_'+quest_type+"_"+quest_id+'" class="questionTitle" placeholder="请输入单选题题目" type="text"/>'+
-                            '</div>'+
-                            '<div class="ur_editor_content">'+
-                            '<ul>'+
-                            '<li class="ur_item">'+
-                            '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                            '</li>'+
-                            '<li class="ur_item">'+
-                            '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
-                            '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                            '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '<li class="ur_item">'+
-                            '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
-                            '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                            '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '<li class="ur_item">'+
-                            '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
-                            '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                            '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '<li class="ur_item">'+
-                            '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
-                            '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                            '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '<li class="ur_item">'+
-                            '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text">'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '</ul>'+
-                            '</div>'+
-                            '<div class="ur_editor_footer">'+
-                            '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),\''+quest_type+'\','+quest_id+');">'+
-                            '保存'+
-                            '</a>'+
-                            '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
-                            '<%= l(:button_cancel)%>'+
-                            '</a>'+
-                            '</div>'+
-                            '<div class="cl"></div>'+
-                            '</div>'+
-                            '<% end%>'
-            );
-        }
+            if(forms.length > 0){
+                alert("请先保存正在编辑的题目再新建。");
+            } else{
+                <% score =exercise_question.question_score %>
+                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>{:controller=> 'exercise',:action=>'create_exercise_question',:course_id=>@course.id},:remote=>true) do |f|%>'+
+                                ' <div class="questionContainer" style="width: 680px;"> '+
+                                '<div class="ur_editor_title"> '+
+                                '<label>问题：&nbsp;&nbsp;</label>'+
+                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
+                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
+                                '<input type="hidden" name="question_type" value="1"/>'+
+                                '<input name="question_title" id="poll_questions_title_'+quest_type+"_"+quest_id+'" class="questionTitle" placeholder="请输入单选题题目" type="text"/>'+
+                                '</div>'+
+                                '<div class="ur_editor_content">'+
+                                '<ul>'+
+                                '<li class="ur_item">'+
+                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '</li>'+
+                                '<li class="ur_item">'+
+                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text">'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '</ul>'+
+                                '</div>'+
+                                '<div class="ur_editor_footer">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),\''+quest_type+'\','+quest_id+');">'+
+                                '保存'+
+                                '</a>'+
+                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
+                                '<%= l(:button_cancel)%>'+
+                                '</a>'+
+                                '</div>'+
+                                '<div class="cl"></div>'+
+                                '</div>'+
+                                '<% end%>'
+                );
+                $("#poll_questions_title_"+quest_type+"_"+quest_id).focus();
+                }
+       }
         else {
             $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
         }
-        $("#poll_questions_title_"+quest_type+"_"+quest_id).focus();
     }
 </script>
\ No newline at end of file
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index 08a012fd3..a6ffbeb82 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -31,74 +31,79 @@
 
 <script type="text/javascript">
     function insert_MCQ(quest_type,quest_num,quest_id){
+        var forms = $("form.new_exercise_question");
         if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == ""){
-            <% score =@exercise.exercise_questions.where("question_type=2").last.nil? ? "" : @exercise.exercise_questions.where("question_type=2").last.question_score %>
-            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                            '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>{:controller=> 'exercise',:action=>'create_exercise_question',:course_id=>@course.id},:remote=>true) do |f|%>'+
-                            ' <div class="questionContainer" style="width: 680px;"> '+
-                            '<div class="ur_editor_title"> '+
-                            '<label>问题：&nbsp;&nbsp;</label>'+
-                            '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
-                            '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
-                            '<input type="hidden" name="question_type" value="2"/>'+
-                            '<input name="question_title" id="poll_questions_title_'+quest_type+"_"+quest_id+'" class="questionTitle" placeholder="请输入多选题题目" type="text"/>'+
-                            '</div>'+
-                            '<div class="ur_editor_content">'+
-                            '<ul>'+
-                            '<li class="ur_item">'+
-                            '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input value="<%= score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                            '</li>'+
-                            '<li class="ur_item">'+
-                            '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
-                            '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                            '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '<li class="ur_item">'+
-                            '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
-                            '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                            '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '<li class="ur_item">'+
-                            '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
-                            '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                            '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '<li class="ur_item">'+
-                            '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
-                            '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                            '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '<li class="ur_item">'+
-                            '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '</ul>'+
-                            '</div>'+
-                            '<div class="ur_editor_footer">'+
-                            '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),\''+quest_type+'\','+quest_id+');">'+
-                            '保存'+
-                            '</a>'+
-                            '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
-                            '<%= l(:button_cancel)%>'+
-                            '</a>'+
-                            '</div>'+
-                            '<div class="cl"></div>'+
-                            '</div>'+
-                            '<% end%>'
-            );
-        } else {
+            if(forms.length > 0){
+                alert("请先保存正在编辑的题目再新建。");
+            } else {
+                <% score =exercise_question.question_score %>
+                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>{:controller=> 'exercise',:action=>'create_exercise_question',:course_id=>@course.id},:remote=>true) do |f|%>'+
+                                ' <div class="questionContainer" style="width: 680px;"> '+
+                                '<div class="ur_editor_title"> '+
+                                '<label>问题：&nbsp;&nbsp;</label>'+
+                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
+                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
+                                '<input type="hidden" name="question_type" value="2"/>'+
+                                '<input name="question_title" id="poll_questions_title_'+quest_type+"_"+quest_id+'" class="questionTitle" placeholder="请输入多选题题目" type="text"/>'+
+                                '</div>'+
+                                '<div class="ur_editor_content">'+
+                                '<ul>'+
+                                '<li class="ur_item">'+
+                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input value="<%= score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '</li>'+
+                                '<li class="ur_item">'+
+                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '</ul>'+
+                                '</div>'+
+                                '<div class="ur_editor_footer">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),\''+quest_type+'\','+quest_id+');">'+
+                                '保存'+
+                                '</a>'+
+                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
+                                '<%= l(:button_cancel)%>'+
+                                '</a>'+
+                                '</div>'+
+                                '<div class="cl"></div>'+
+                                '</div>'+
+                                '<% end%>'
+                );
+                $("#poll_questions_title_"+quest_type+"_"+quest_id).focus();
+        }
+        }else {
             $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
         }
-        $("#poll_questions_title_"+quest_type+"_"+quest_id).focus();
     }
 </script>
\ No newline at end of file
diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb
index 8232e68f3..4e36530ed 100644
--- a/app/views/exercise/_show_single.html.erb
+++ b/app/views/exercise/_show_single.html.erb
@@ -19,62 +19,67 @@
 
 <script type="text/javascript">
     function insert_SINGLE(quest_type,quest_num,quest_id){
+        var forms = $("form.new_exercise_question");
         if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == "") {
-            <% score = @exercise.exercise_questions.where("question_type=3").last.nil? ? "" : @exercise.exercise_questions.where("question_type=3").last.question_score %>
-            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                            '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>{:controller=> 'exercise',:action=>'create_exercise_question',:course_id=>@course.id},:remote=>true) do |f|%>'+
-                            ' <div class="questionContainer" style="width: 680px;"> '+
-                            '<div class="ur_editor_title"> '+
-                            '<label>问题：&nbsp;&nbsp;</label>'+
-                            '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
-                            '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
-                            '<input type="hidden" name="question_type" value="3"/>'+
-                            '<input name="question_title" id="poll_questions_title_'+quest_type+"_"+quest_id+'" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text"/>'+
-                            '</div>'+
-                            '<div class="ur_editor_content">'+
-                            '<ul>'+
-                            '<li class="ur_item">'+
-                            '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input value="<%= score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
-                            '</li>'+
-                            '<li class="ur_item">'+
-                            '<label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input type="text" name="exercise_choice[0]" placeholder="请输入候选答案一"/>'+
-                            '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                            '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '<li class="ur_item">'+
-                            '<label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input type="text" name="exercise_choice[1]" placeholder="请输入候选答案二（选填）"/>'+
-                            '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                            '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '<li class="ur_item">'+
-                            '<label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
-                            '<input maxlength="200" type="text" name="exercise_choice[2]" placeholder="请输入候选答案三（选填）"/>'+
-                            '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
-                            '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
-                            '</li>'+
-                            '<div class="cl"></div>'+
-                            '</ul>'+
-                            '</div>'+
-                            '<div class="ur_editor_footer">'+
-                            '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),\''+quest_type+'\','+quest_id+');">'+
-                            '保存'+
-                            '</a>'+
-                            '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
-                            '<%= l(:button_cancel)%>'+
-                            '</a>'+
-                            '</div>'+
-                            '<div class="cl"></div>'+
-                            '</div>'+
-                            '<% end%>'
-            );
+            if(forms.length > 0){
+                alert("请先保存正在编辑的题目再新建。");
+            } else {
+                <% score =exercise_question.question_score %>
+                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>{:controller=> 'exercise',:action=>'create_exercise_question',:course_id=>@course.id},:remote=>true) do |f|%>'+
+                                ' <div class="questionContainer" style="width: 680px;"> '+
+                                '<div class="ur_editor_title"> '+
+                                '<label>问题：&nbsp;&nbsp;</label>'+
+                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
+                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
+                                '<input type="hidden" name="question_type" value="3"/>'+
+                                '<input name="question_title" id="poll_questions_title_'+quest_type+"_"+quest_id+'" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text"/>'+
+                                '</div>'+
+                                '<div class="ur_editor_content">'+
+                                '<ul>'+
+                                '<li class="ur_item">'+
+                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input value="<%= score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '</li>'+
+                                '<li class="ur_item">'+
+                                '<label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="text" name="exercise_choice[0]" placeholder="请输入候选答案一"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="text" name="exercise_choice[1]" placeholder="请输入候选答案二（选填）"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="exercise_choice[2]" placeholder="请输入候选答案三（选填）"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '</ul>'+
+                                '</div>'+
+                                '<div class="ur_editor_footer">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),\''+quest_type+'\','+quest_id+');">'+
+                                '保存'+
+                                '</a>'+
+                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
+                                '<%= l(:button_cancel)%>'+
+                                '</a>'+
+                                '</div>'+
+                                '<div class="cl"></div>'+
+                                '</div>'+
+                                '<% end%>'
+                );
+                $("#poll_questions_title_"+quest_type+"_"+quest_id).focus();
+            }
         } else {
             $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
         }
-        $("#poll_questions_title_"+quest_type+"_"+quest_id).focus();
     }
 </script>
\ No newline at end of file