fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 20:12:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

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

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


git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5995 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2009-03-30 08:12:15 +00:00
parent 297b65d79e
commit 1dd306d4db
9 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/document/document.model.php
View file

@ -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];
}

11
modules/member/member.admin.controller.php
View file

@ -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);
else $output = executeQuery('member.updateJoinForm', $args);
if(!$args->member_join_form_srl){
$args->list_order = getNextSequence();
$output = executeQuery('member.insertJoinForm', $args);
}else{
$output = executeQuery('member.updateJoinForm', $args);
}
if(!$output->toBool()) return $output;

1
modules/member/member.admin.view.php
View file

@ -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);
}

4
modules/member/member.model.php
View file

@ -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 = '';

1
modules/member/member.view.php
View file

@ -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));
// 템플릿 파일 지정

10
modules/member/skins/default/signup_form.html
View file

@ -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}">

1
modules/member/tpl/js/member_admin.js
View file

@ -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';

3
modules/poll/queries/getPollItem.xml
View file

@ -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>

6
modules/widget/widget.controller.php
View file

@ -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);