From d55492b07a183410dbbc05f2d1e264e7fd047f22 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 18:17:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E9=A2=98=E7=9A=84=E8=B7=AF=E7=94=B1=E3=80=81action?=
 =?UTF-8?q?=E3=80=81=E4=BB=A5=E5=8F=8Ajs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb         |  7 ++-
 app/views/poll/_edit_MC.html.erb           | 58 +++++++++++-----------
 app/views/poll/update_poll_question.js.erb |  0
 config/routes.rb                           |  2 +-
 4 files changed, 35 insertions(+), 32 deletions(-)
 create mode 100644 app/views/poll/update_poll_question.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 48b1af43a..e94b0f132 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -114,7 +114,12 @@ class PollController < ApplicationController
 
   #修改单选题
   def update_poll_question
-   a = 1
+    @poll_question = PollQuestion.find params[:poll_question]
+    @poll = @poll_question.poll
+
+    respond_to do |format|
+      format.js
+    end
   end
 
   #删除单选题
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 6010132fb..fa0e8d802 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,33 +1,31 @@
-<%= form_for poll_question,:url =>update_poll_question_poll_path(@poll.id),:remote => true do |f|%>
-    <div>
-      <!--编辑单选start-->
-      <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 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" : ""%>/>
-          <label>必答</label>
-        </div>
-        <div class="ur_editor_content">
-          <ul>
-            <% 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' 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%>
-          </ul>
-        </div>
-        <div class="ur_editor_footer">
-          <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
-          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
-        </div>
-        <div class="cl"></div>
+<%= form_for(poll_question,:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
+    <!--编辑单选start-->
+    <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 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" : ""%>/>
+        <label>必答</label>
       </div>
-      <!--编辑单选 end-->
+      <div class="ur_editor_content">
+        <ul>
+          <% 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' 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%>
+        </ul>
+      </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>
+      </div>
+      <div class="cl"></div>
     </div>
+    <!--编辑单选 end-->
 <% end%>
\ No newline at end of file
diff --git a/app/views/poll/update_poll_question.js.erb b/app/views/poll/update_poll_question.js.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/config/routes.rb b/config/routes.rb
index 14f23b5f4..e089e8420 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,10 +62,10 @@ RedmineApp::Application.routes.draw do
     member do
       get 'statistics_result'
       post 'create_poll_question'
-      post 'update_poll_question'
     end
     collection do
       delete 'delete_poll_question'
+      post 'update_poll_question'
     end
   end