From 4e19690887a77152884bfc33dc7e3c6a7eb55981 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 11:58:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8F=96=E6=B6=88=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=A4=9A=E8=A1=8C=E4=B8=BB=E8=A7=82=E5=90=8E=E5=A4=9A?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BB=E8=A7=82=E4=BB=8E=E9=A1=B5=E9=9D=A2=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=202.=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91=E5=90=8E?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=EF=BC=8C=E7=AC=AC=E4=BA=8C=E6=AC=A1=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E7=BC=96=E8=BE=91=E5=8D=B4=E6=98=BE=E7=A4=BA=E5=89=8D?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=BC=96=E8=BE=91=E7=9A=84=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=20#1810=20#1806?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MC.html.erb     | 23 ++++++++++++++++++++---
 app/views/poll/_edit_MCQ.html.erb    | 22 +++++++++++++++++++---
 app/views/poll/_edit_mulit.html.erb  | 11 +++++++++--
 app/views/poll/_edit_single.html.erb | 11 +++++++++--
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 505e9acc1..066eafe0d 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,15 +1,32 @@
 <%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
     <!--编辑单选start-->
+    <script type="text/javascript">
+      function resetQuestion<%=poll_question.id%>()
+      {
+          $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+          $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+          $("#poll_answers_<%=poll_question.id%>").html("<% poll_question.poll_answers.reorder('answer_position').each do |poll_answer| %>" +
+              "<li class='ur_item'>" +
+              "<label>选项<span class='ur_index'></span>：</label>" +
+              "<input type='text'  maxlength='200' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value='<%= poll_answer.answer_text%>'/>" +
+              "<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>" +
+            "<% end%>");
+      }
+    </script>
+
     <div class="ur_editor radio">
       <div class="ur_editor_title">
         <label>问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
         <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
-        <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+        <input type="checkbox" name="is_necessary" id="is_necessary_<%=poll_question.id%>" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
         <label>必答</label>
       </div>
       <div class="ur_editor_content">
-        <ul>
+        <ul id="poll_answers_<%=poll_question.id%>">
           <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
               <li class='ur_item'>
                 <label>选项<span class='ur_index'></span>：</label>
@@ -23,7 +40,7 @@
       </div>
       <div class="ur_editor_footer">
         <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
       </div>
       <div class="cl"></div>
     </div>
diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index 5e267b03e..613fed371 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -1,13 +1,29 @@
 <%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%><!--编辑多选start-->
+    <script type="text/javascript">
+        function resetQuestion<%=poll_question.id%>()
+        {
+            $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+            $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+            $("#poll_answers_<%=poll_question.id%>").html("<% poll_question.poll_answers.reorder('answer_position').each do |poll_answer| %>" +
+                    "<li class='ur_item'>" +
+                    "<label>选项<span class='ur_index'></span>：</label>" +
+                    "<input type='text'  maxlength='200' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value='<%= poll_answer.answer_text%>'/>" +
+                    "<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>" +
+                    "<% end%>");
+        }
+    </script>
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
       <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
       <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
-      <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+      <input type="checkbox" name="is_necessary" id="is_necessary_<%=poll_question.id%>" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
       <label>必答</label>
     </div>
     <div class="ur_editor_content">
-      <ul>
+      <ul id="poll_answers_<%=poll_question.id%>">
         <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
             <li class='ur_item'>
               <label>选项<span class='ur_index'></span>：</label>
@@ -21,7 +37,7 @@
     </div>
     <div class="ur_editor_footer">
       <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
     </div>
     <div class="cl"></div>
   </div><!--编辑多选 end-->
diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index 99cd8afff..d498169f4 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -1,10 +1,17 @@
 <%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
+<script type="text/javascript">
+    function resetQuestion<%=poll_question.id%>()
+    {
+        $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+        $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+    }
+</script>
 <div class="ur_editor textarea"> <!--编辑多行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
     <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入多行主观标题" value="<%= poll_question.question_title%>"/>
-    <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+    <input type="checkbox" id="is_necessary_<%=poll_question.id%>" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
     <label for="ur_question_require">必答</label>
   </div>
   <div class="ur_editor_toolbar">
@@ -14,7 +21,7 @@
   </div>
   <div class="ur_editor_footer">
     <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-    <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
+    <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
   </div>
   <div class="cl"></div>
 </div><!--编辑多行文字end-->
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index 926000c90..2c2d41e0f 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -1,16 +1,23 @@
 <%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
+<script type="text/javascript">
+    function resetQuestion<%=poll_question.id%>()
+    {
+        $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+        $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+    }
+</script>
 <div class="ur_editor text "> <!--编辑单行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
     <input  maxlength="250" id="poll_questions_title_<%=poll_question.id%>" class="ur_question_title" contenteditable="true" type="text"
            name="poll_questions_title"  placeholder="请输入单行主观标题" value="<%= poll_question.question_title%>"/>
-    <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+    <input type="checkbox" id="is_necessary_<%=poll_question.id%>" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
     <label for="ur_question_require">必答</label>
   </div>
   <div class="ur_editor_footer">
     <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-    <a class="btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+    <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
   </div>
   <div class="cl"></div>
 </div><!--编辑单行文字end-->