From 9d6c3fe5213df85eed3a9a45a375a57cc5f13e91 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Wed, 27 Jan 2010 07:26:35 +0000
Subject: [PATCH] #18649209 : fixed a bug that in a poll, users cannot set poll
 with multiple options

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7249 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/editor/components/poll_maker/tpl/popup.html | 7 ++++---
 modules/poll/skins/default/js/poll.js               | 4 ++--
 modules/poll/skins/simple/js/poll.js                | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index 5226c73bc..ddfc49b5f 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -61,9 +61,6 @@
                 </select>
             </td>
         </tr>
-        <tr>
-            <th scope="row"><div><label>{$lang->poll_chk_count}</label></div></th>
-            <td><input type="text" name="checkcount_tidx" value="1" size="1" class="inputTypeText" /></td>
         </table>
 
         <div id="poll_source" class="clear" style="display:none">
@@ -72,6 +69,10 @@
             <table cellspacing="0" class="rowTable gap1">
             <col width="100" />
             <col />
+            <tr>
+            <th scope="row"><div><label>{$lang->poll_chk_count}</label></div></th>
+            <td><input type="text" name="checkcount_tidx" value="1" size="1" class="inputTypeText" /></td>
+            </tr>
             <tr>
                 <th scope="row"><div>{$lang->poll_title}</div></th>
                 <td><input type="text" name="title_tidx" class="inputTypeText w400" /></td>
diff --git a/modules/poll/skins/default/js/poll.js b/modules/poll/skins/default/js/poll.js
index 5c359e814..0994589b4 100644
--- a/modules/poll/skins/default/js/poll.js
+++ b/modules/poll/skins/default/js/poll.js
@@ -26,9 +26,9 @@ function doPoll(fo_obj) {
     var poll_srl_indexes = "";
     for(var poll_srl_index in checkcount) {
 	if(!checkcount.hasOwnProperty(poll_srl_index)) continue;
-        var count = checkcount[poll_srl_index];
+        var count = parseInt(checkcount[poll_srl_index]);
         var items = item[poll_srl_index];
-        if(items.length < 1 || count < items.length) {
+        if(items.length < 1 || count > items.length) {
             alert(poll_alert_lang);
             return false;
         }
diff --git a/modules/poll/skins/simple/js/poll.js b/modules/poll/skins/simple/js/poll.js
index 5c359e814..0994589b4 100644
--- a/modules/poll/skins/simple/js/poll.js
+++ b/modules/poll/skins/simple/js/poll.js
@@ -26,9 +26,9 @@ function doPoll(fo_obj) {
     var poll_srl_indexes = "";
     for(var poll_srl_index in checkcount) {
 	if(!checkcount.hasOwnProperty(poll_srl_index)) continue;
-        var count = checkcount[poll_srl_index];
+        var count = parseInt(checkcount[poll_srl_index]);
         var items = item[poll_srl_index];
-        if(items.length < 1 || count < items.length) {
+        if(items.length < 1 || count > items.length) {
             alert(poll_alert_lang);
             return false;
         }