회원가입시 확장변수 라디오 타입 버그

설문조사 아이템 순서 order type 정의


git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5995 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/document/document.model.php

@@ -457,6 +457,8 @@
                 $oExtraVar->setExtraVarKeys($output->data);
                 $GLOBALS['XE_EXTRA_KEYS'][$module_srl] = $oExtraVar->getExtraVars();
             }
+
+            ksort($GLOBALS['XE_EXTRA_KEYS'][$module_srl]);
             return $GLOBALS['XE_EXTRA_KEYS'][$module_srl];
         }
 
@@ -470,6 +472,7 @@
                 $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
                 $this->setToAllDocumentExtraVars();
             }
+            ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
             return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
         }
 

modules/member/member.admin.controller.php

@@ -170,18 +170,21 @@
             $args->required = Context::get('required');
             if(!in_array(strtoupper($args->required), array('Y','N'))) $args->required = 'N';
             $args->description = Context::get('description');
-            $args->list_order = getNextSequence();
 
             // 기본값의 정리
-            if(in_array($args->column_type, array('checkbox','select')) && count($args->default_value) ) {
+            if(in_array($args->column_type, array('checkbox','select','radio')) && count($args->default_value) ) {
                 $args->default_value = serialize($args->default_value);
             } else {
                 $args->default_value = '';
             }
 
             // member_join_form_srl이 있으면 수정, 없으면 추가
-            if(!$args->member_join_form_srl) $output = executeQuery('member.insertJoinForm', $args);
+            if(!$args->member_join_form_srl){
-            else $output = executeQuery('member.updateJoinForm', $args);
+                $args->list_order = getNextSequence();
+                $output = executeQuery('member.insertJoinForm', $args);
+            }else{
+                $output = executeQuery('member.updateJoinForm', $args);
+            }
 
             if(!$output->toBool()) return $output;
 

modules/member/member.admin.view.php

@@ -200,6 +200,7 @@
             if($member_join_form_srl) {
                 $oMemberModel = &getModel('member');
                 $join_form = $oMemberModel->getJoinForm($member_join_form_srl);
+
                 if(!$join_form) Context::set('member_join_form_srl','',true);
                 else Context::set('join_form', $join_form);
             }

modules/member/member.model.php

@@ -378,7 +378,7 @@
                     $lang->extend_vars[$column_name] = $column_title;
 
                     // checkbox, select등 다수 데이터 형식일 경우 unserialize해줌
-                    if(in_array($column_type, array('checkbox','select'))) {
+                    if(in_array($column_type, array('checkbox','select','radio'))) {
                         $join_form_list[$i]->default_value = unserialize($default_value);
                         if(!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
                     } else {
@@ -470,7 +470,7 @@
             $column_type = $join_form->column_type;
             $default_value = $join_form->default_value;
 
-            if(in_array($column_type, array('checkbox','select'))) {
+            if(in_array($column_type, array('checkbox','select','radio'))) {
                 $join_form->default_value = unserialize($default_value);
             } else {
                 $join_form->default_value = '';

modules/member/member.view.php

@@ -75,7 +75,6 @@
 
             // 회원가입을 중지시켰을 때는 에러 표시
             if($this->member_config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
-
             Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
             
             // 템플릿 파일 지정

modules/member/skins/default/signup_form.html

@@ -125,6 +125,16 @@
                     </ul>
                 <!--@end-->
 
+
+            <!--@elseif($val->column_type == 'radio')-->
+                <!--@if($val->default_value)-->
+                    <ul class="checkbox">
+                    <!--@foreach($val->default_value as $v)-->
+                        <li><input type="radio" name="{$val->column_name}" value="{$v}" <!--@if(is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/>{$v}</li>
+                    <!--@end-->
+                    </ul>
+                <!--@end-->
+
             <!--// 단일 선택 -->
             <!--@elseif($val->column_type == 'select')-->
                 <select name="{$val->column_name}">

modules/member/tpl/js/member_admin.js

@@ -118,6 +118,7 @@ function completeInsertJoinForm(ret_obj) {
 function doShowJoinFormValue(sel_obj) {
     var val = sel_obj.options[sel_obj.selectedIndex].value;
     switch(val) {
+        case 'radio' :
         case 'checkbox' :
         case 'select' :
                 xGetElementById('zone_default_value').style.display = 'block';

modules/poll/queries/getPollItem.xml

@@ -9,4 +9,7 @@
         <condition operation="equal" column="poll_srl" var="poll_srl" />
         <condition operation="equal" column="poll_index_srl" var="poll_index_srl" pipe="and" />
     </conditions>
+    <navigation>
+        <index var="sort_index" default="poll_item_srl" order="asc" />
+    </navigation>
 </query>

modules/widget/widget.controller.php

@@ -46,7 +46,7 @@
                 $widgetStyle_info = $oWidgetModel->getWidgetStyleInfo($request_vars->widgetstyle);
                 if(count($widgetStyle_info->extra_var)) {
                     foreach($widgetStyle_info->extra_var as $key=>$val) {
-                        if($val->type =='text' || $val->type =='select' || $val->type =='filebox'){
+                        if($val->type =='color' || $val->type =='text' || $val->type =='select' || $val->type =='filebox'){
                             $vars->{$key} = trim($request_vars->{$key});
                         }
                     }
@@ -155,10 +155,6 @@
 
 
             // 박스 위젯을 다시 구함
-//            $content = preg_replace_callback('!<div([^\>]*)widget=([^\>]*?)\><div><div>!is', array($this,'transWidgetBox'), $content);
-
-            // 박스 위젯을 다시 구함
-
             $content = preg_replace_callback('!<div([^\>]*)widget=([^\>]*?)\><div><div>((<img.*?>)*)!is', array($this,'transWidgetBox'), $content);