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

#139 확장변수 정렬 기능 오류 수정(_setSortIndex() 중복실행 오류 수정)

Browse source
This commit is contained in:
khongchi 2013-12-11 10:26:35 +09:00
parent fb998623ea
commit 916b24bc00
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -219,6 +219,8 @@ class documentModel extends document
{
$sort_check = $this->_setSortIndex($obj, $load_extra_vars);
$obj->sort_index = $sort_check->sort_index;
$obj->isExtraVars = $sort_check->isExtraVars;
// cache controll
$oCacheHandler = &CacheHandler::getInstance('object');
if($oCacheHandler->isSupport())
@ -612,8 +614,11 @@ class documentModel extends document
*/
function getDocumentPage($oDocument, $opt)
{
$sort_check = $this->_setSortIndex($opt, TRUE);
$opt->sort_index = $sort_check->sort_index;
$opt->isExtraVars = $sort_check->isExtraVars;
$this->_setSearchOption($opt, $args, $query_id, $use_division);
$sort_check = $this->_setSortIndex($args, TRUE);
if($sort_check->isExtraVars)
{
@ -1282,10 +1287,9 @@ class documentModel extends document
$args->member_srl = $searchOpt->member_srl;
$logged_info = Context::get('logged_info');
$sort_check = $this->_setSortIndex($searchOpt, $load_extra_vars);
$args->sort_index = $sort_check->sort_index;
$args->sort_index = $searchOpt->sort_index;
// Check the target and sequence alignment
$orderType = array('desc' => 1, 'asc' => 1);
if(!isset($orderType[$args->order_type])) $args->order_type = 'asc';
@ -1409,7 +1413,7 @@ class documentModel extends document
}
}
if ($sort_check->isExtraVars)
if ($searchOpt->isExtraVars)
{
$query_id = 'document.getDocumentListExtraSort';
}