#19241621 member table 에 정렬필드 list_order 추가

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7805 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-11-05 06:04:58 +00:00
parent 7a473ac37d
commit 6189a3aba1
7 changed files with 42 additions and 13 deletions

View file

@ -51,22 +51,22 @@
$args->s_email_address = $search_keyword;
break;
case 'regdate' :
$args->s_regdate = ereg_replace("[^0-9]","",$search_keyword);
$args->s_regdate = preg_replace("/[^0-9]/","",$search_keyword);
break;
case 'regdate_more' :
$args->s_regdate_more = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14);
$args->s_regdate_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
break;
case 'regdate_less' :
$args->s_regdate_less = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14);
$args->s_regdate_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
break;
case 'last_login' :
$args->s_last_login = $search_keyword;
break;
case 'last_login_more' :
$args->s_last_login_more = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14);
$args->s_last_login_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
break;
case 'last_login_less' :
$args->s_last_login_less = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14);
$args->s_last_login_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
break;
case 'extra_vars' :
$args->s_extra_vars = ereg_replace("[^0-9]","",$search_keyword);
@ -75,8 +75,13 @@
}
// selected_group_srl이 있으면 query id를 변경 (table join때문에)
$sort_order = Context::get('sort_order');
$sort_index = Context::get('sort_index');
if($sort_index != 'last_login') $sort_index = "member_srl";
if($sort_index != 'last_login') {
$sort_index = "list_order";
}else{
$sort_order = 'desc';
}
if($args->selected_group_srl) {
$query_id = 'member.getMemberListWithinGroup';
$args->sort_index = "member.".$sort_index;
@ -84,8 +89,7 @@
$query_id = 'member.getMemberList';
$args->sort_index = $sort_index;
}
$sort_order = Context::get('sort_order');
if($sort_order != "asc") $sort_order = "desc";
if($sort_order != "desc") $sort_order = "asc";
$args->sort_order = $sort_order;
Context::set('sort_order', $sort_order);
@ -93,7 +97,8 @@
$args->page = Context::get('page');
$args->list_count = 40;
$args->page_count = 10;
return executeQuery($query_id, $args);
$output = executeQuery($query_id, $args);
return $output;
}
/**

View file

@ -153,6 +153,9 @@
if(!$oDB->isColumnExists("member", "find_account_question")) return true;
if(!$oDB->isColumnExists("member", "find_account_answer")) return true;
if(!$oDB->isColumnExists("member", "list_order")) return true;
if(!$oDB->isIndexExists("member","idx_list_order")) return true;
return false;
}
@ -206,6 +209,18 @@
$oDB->addColumn("member", "find_account_answer", "varchar", 250);
}
if(!$oDB->isColumnExists("member", "list_order")) {
$oDB->addColumn("member", "list_order", "number", 11);
set_time_limit(0);
$args->list_order = 'member_srl';
executeQuery('member.updateMemberListOrderAll',$args);
executeQuery('member.updateMemberListOrderAll');
}
if(!$oDB->isIndexExists("member","idx_list_order")) {
$oDB->addIndex("member","idx_list_order", array("list_order"));
}
return new Object(0, 'success_updated');
}

View file

@ -23,7 +23,7 @@
</group>
</conditions>
<navigation>
<index var="sort_index" default="member_srl" order="sort_order" />
<index var="sort_index" default="list_order" order="sort_order" />
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />

View file

@ -26,7 +26,7 @@
</group>
</conditions>
<navigation>
<index var="sort_index" default="member.member_srl" order="sort_order" />
<index var="sort_index" default="member.list_order" order="sort_order" />
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />

View file

@ -5,4 +5,4 @@
<columns>
<column name="change_password_date" var="change_password_date" notnull="notnull" default="curdate()" />
</columns>
</query>
</query>

View file

@ -0,0 +1,8 @@
<query id="updateMemberListOrderAll" action="update">
<tables>
<table name="member" />
</tables>
<columns>
<column name="list_order" notnull="notnull" var="list_order" default="multiply(-1)" />
</columns>
</query>

View file

@ -22,4 +22,5 @@
<column name="is_admin" type="char" size="1" default="N" index="idx_is_admin" />
<column name="description" type="text" />
<column name="extra_vars" type="text" />
</table>
<column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
</table>