diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb
index 0cc34958f..bc91ead85 100644
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@@ -18,9 +18,9 @@
       <div class="cl"></div>
       <div class="cl"></div>
     </div>
-    <% mc_question_list = exercise_questions.where("question_type=1") %>
-    <% mcq_question_list = exercise_questions.where("question_type=2") %>
-    <% single_question_list = exercise_questions.where("question_type=3") %>
+    <% mc_question_list = exercise.exercise_questions.where("question_type=1") %>
+    <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %>
+    <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
     <div class="testStatus" id="mc_question_list" style="display: <%=mc_question_list.count > 0 ? "" : "none" %>">
       <h3 class="fontGrey3">单选题</h3>
       <% mc_question_list.each do |exercise_question| %>
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index 40f9b953b..8a723d75c 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -19,9 +19,9 @@
       <div class="cl"></div>
     </div>
     <div class="mb5">得分：<span class="c_red"><%=exercise_user.score %>分</span></div>
-    <% mc_question_list = exercise_questions.where("question_type=1") %>
-    <% mcq_question_list = exercise_questions.where("question_type=2") %>
-    <% single_question_list = exercise_questions.where("question_type=3") %>
+    <% mc_question_list = exercise.exercise_questions.where("question_type=1") %>
+    <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %>
+    <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
     <div class="testStatus" id="mc_question_list" style="display: <%=mc_question_list.count > 0 ? "" : "none" %>">
       <h3 class="fontGrey3">单选题</h3>
       <% mc_question_list.each do |exercise_question| %>
diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb
index 4ddd5054d..b803519ce 100644
--- a/app/views/exercise/_exercise_teacher.html.erb
+++ b/app/views/exercise/_exercise_teacher.html.erb
@@ -107,7 +107,12 @@
     </div>
     <div class="ur_buttons">
       <%= link_to "确定",exercise_index_path(:course_id => @course.id),:class => "ur_button_submit" %>
-      <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "ur_button_submit", :style => "float:right"%>
+      <% if exercise.exercise_status == 1 %>
+        <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "ur_button_submit", :style => "float:right"%>
+      <% else %>
+        <span class="ur_button_submit" style="float:right; background:#a3a3a3" title="测验已发布，不可再编辑">编辑</span>
+        <%#= link_to l(:button_edit), '', :class => "ur_button_submit", :style => "float:right; background:#a3a3a3"%>
+      <% end %>
     </div>
     <div class="cl"></div>
     <!--contentbox end-->
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index 0883995dc..183e8d190 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -39,7 +39,7 @@
             } else{
                 <% score =exercise_question.question_score %>
                 $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.id),:remote=>true) do |f|%>'+
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
                                 ' <div class="questionContainer" style="width: 680px;"> '+
                                 '<div class="ur_editor_title"> '+
                                 '<label>问题：&nbsp;&nbsp;</label>'+
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index 52f01e6c7..af2b0facb 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -38,7 +38,7 @@
             } else {
                 <% score =exercise_question.question_score %>
                 $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.id),:remote=>true) do |f|%>'+
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
                                 ' <div class="questionContainer" style="width: 680px;"> '+
                                 '<div class="ur_editor_title"> '+
                                 '<label>问题：&nbsp;&nbsp;</label>'+
diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb
index 933f2edcc..9c7936e6d 100644
--- a/app/views/exercise/_show_single.html.erb
+++ b/app/views/exercise/_show_single.html.erb
@@ -26,7 +26,7 @@
             } else {
                 <% score =exercise_question.question_score %>
                 $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
-                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.id),:remote=>true) do |f|%>'+
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
                                 ' <div class="questionContainer" style="width: 680px;"> '+
                                 '<div class="ur_editor_title"> '+
                                 '<label>问题：&nbsp;&nbsp;</label>'+
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index e267b9010..5ff34a4e1 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1165,4 +1165,5 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px  no-repeat;}
 .testEditTitle{ padding:10px 0px ; float:left; width:564px; }
 .questionEditContainer {border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px; margin-top:10px;}
 .fillInput {border:1px solid #cbcbcb; padding-left:5px; background-color:#ffffff; width:693px; height:30px; color:#888888;}
-.mr130 {margin-right:130px;}
\ No newline at end of file
+.mr130 {margin-right:130px;}
+.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; margin-bottom:10px; }
\ No newline at end of file