From 8a489f6f16d8eb00060704d4db97f84ce6b6eb8e Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 6 Apr 2007 05:33:15 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1001
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/editor/components/poll/tpl/popup.html | 2 +-
 modules/poll/poll.controller.php              | 5 ++---
 modules/poll/schemas/poll_title.xml           | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/editor/components/poll/tpl/popup.html b/modules/editor/components/poll/tpl/popup.html
index b67b93314..e8b4ee081 100644
--- a/modules/editor/components/poll/tpl/popup.html
+++ b/modules/editor/components/poll/tpl/popup.html
@@ -53,11 +53,11 @@
                 <div class="body"><input type="text" name="item_tidx_3" class="editor_input" /></div>
             </div>
             <div class="sub_button_area">
-                <div><input type="button" value="{$lang->cmd_del_poll}" class="editor_button" onclick="doPollDelete(this); return false;" /></div>
                 <div><input type="button" value="{$lang->cmd_add_item}" class="editor_button" onclick="doPollAddItem(this); return false;" /></div>
                 <div>
                     - {$lang->poll_chk_count} : <input type="text" name="checkcount_tidx" value="1" class="editor_small_input" />
                 </div>
+                <div><input type="button" value="{$lang->cmd_del_poll}" class="editor_button" onclick="doPollDelete(this); return false;" /></div>
             </div>
         </div>
 
diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php
index a6adc6753..e234936b7 100644
--- a/modules/poll/poll.controller.php
+++ b/modules/poll/poll.controller.php
@@ -50,7 +50,6 @@
 
             // 변수 설정
             $poll_srl = getNextSequence();
-            debugPrint($args);
 
             $logged_info = Context::get('logged_info');
             $member_srl = $logged_info->member_srl?$logged_info->member_srl:0;
@@ -75,7 +74,7 @@
             foreach($args->poll as $key => $val) {
                 unset($poll_args);
                 $poll_args->poll_srl = $poll_srl;
-                $poll_args->poll_index_srl = $key;
+                $poll_args->poll_index_srl = $key+1;
                 $poll_args->title = $val->title;
                 $poll_args->checkcount = $val->checkcount;
                 $poll_args->poll_count = 0;
@@ -89,7 +88,7 @@
                 foreach($val->item as $k => $v) {
                     unset($poll_args);
                     $poll_args->poll_srl = $poll_srl;
-                    $poll_args->poll_index_srl = $key;
+                    $poll_args->poll_index_srl = $key+1;
                     $poll_args->title = $v;
                     $poll_args->poll_count = 0;
                     $output = executeQuery('poll.insertPollItem', $poll_args);
diff --git a/modules/poll/schemas/poll_title.xml b/modules/poll/schemas/poll_title.xml
index b7052dc43..6527acd7e 100644
--- a/modules/poll/schemas/poll_title.xml
+++ b/modules/poll/schemas/poll_title.xml
@@ -1,6 +1,6 @@
 <table name="poll_title">
     <column name="poll_srl" type="number" size="11" notnull="notnull" index="idx_poll_srl" />
-    <column name="poll_index_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
+    <column name="poll_index_srl" type="number" size="11" notnull="notnull" index="idx_poll_srl" />
     <column name="title" type="varchar" size="250" notnull="notnull" />
     <column name="checkcount" type="number" size="11" notnull="notnull" default="1" />
     <column name="poll_count" type="number" size="11" notnull="notnull" />