From 7fb78e48162f0e7bba877f54a019379f371438fb Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 25 Nov 2015 10:38:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=B5=8B=E9=AA=8C=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E7=AD=89=E5=86=85=E5=AE=B9=E6=97=B6=20=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=8F=96=E6=B6=88=E5=BA=94=E8=BF=98=E5=8E=9F=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=A1=86=E4=B8=AD=E7=9A=84=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_edit_head.html.erb | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb
index 6c357130c..c8ba0c4d7 100644
--- a/app/views/exercise/_edit_head.html.erb
+++ b/app/views/exercise/_edit_head.html.erb
@@ -3,9 +3,6 @@
       <div>
         <input name="exercise[exercise_name]" maxlength="100" id="exercise_name" class="testTitle mb10" type="text" placeholder="测验标题" value="<%=@exercise.exercise_name%>" />
       </div>
-      <%# if edit_mode %>
-      <!--<label class="fl c_grey f14" style="margin-top: 4px;">发布日期(可选)：</label>-->
-      <%# end %>
       <label class="fl c_grey f14" style="margin-top: 4px;">截止时间：</label>
       <div class="calendar_div fl">
         <input  type="text" name="exercise[end_time]" id="exercise_end_time" placeholder="截止时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>"/>
@@ -23,10 +20,20 @@
         <a class="btn_submit c_white" data-button="ok" onclick="pollsSubmit($(this));">
           保存
         </a>
-        <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">
+        <a class="btn_cancel" data-button="cancel" onclick="resetHead();pollsCancel();">
           <%= l(:button_cancel)%>
         </a>
       </div>
       <div class="cl"></div>
     </div>
-<% end %>
\ No newline at end of file
+<% end %>
+<script type="text/javascript">
+    function resetHead()
+    {
+        $("#exercise_name").val("<%=@exercise.exercise_name%>");
+        $("#exercise_end_time").val("<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>");
+        $("#exercise_time").val("<%=exercise.time if exercise.time!= -1 %>");
+        $("#exercise_publish_time").val("<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if !exercise.publish_time.nil?%>");
+        $("#exercise_description").val("<%=exercise.exercise_description %>");
+    }
+</script>
\ No newline at end of file