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

bug-fix pagination Limit

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8510 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
lickawtl 2011-06-20 09:25:58 +00:00
parent 4b3e591956
commit 32fe8750e9
3 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/db/DBCubrid.class.php
View file

@ -668,9 +668,9 @@
$buff = new Object ();
$buff->total_count = $total_count;
$buff->total_page = $total_page;
$buff->page = $queryObject->getLimit()->page;
$buff->page = $queryObject->getLimit()->page->getValue();
$buff->data = $data;
$buff->page_navigation = new PageHandler($total_count, $total_page, $queryObject->getLimit()->page, $queryObject->getLimit()->page_count);
$buff->page_navigation = new PageHandler($total_count, $total_page, $queryObject->getLimit()->page->getValue(), $queryObject->getLimit()->page_count);
}else{
$data = $this->_fetch($result);
$buff = new Object ();

2
classes/db/queryparts/limit/Limit.class.php
View file

@ -8,7 +8,7 @@
function Limit($list_count, $page= NULL, $page_count= NULL){
$this->list_count = $list_count;
if ($page){
$this->start = ($page-1)*$list_count;
$this->start = ($page-1)*$list_count->getValue();
$this->page_count = $page_count;
$this->page = $page;
}

24
test-phpUnit/SelectXmlTest_Cubrid.php
View file

@ -171,6 +171,30 @@
group by "module_srl"';
$this->_test($xml_file, $argsString, $expected);
}
function test_syndication_getDocumentList(){
define('__ZBXE__', 1);
require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
$db = &DB::getInstance('cubrid');
$args = new StdClass();
$args->module_srl = NULL;
$args->exclude_module_srl = NULL;
$args->category_srl = NULL;
$args->sort_index = 'list_order';
$args->order_type = 'asc';
$args->page = 5;
$args->list_count = 30;
$args->page_count = 10;
$args->start_date = NULL;
$args->end_date = NULL;
$args->member_srl = NULL;
$output = $db->executeQuery('document.getDocumentList', $args);
$this->assertTrue(is_int($output->page));
// $this->assertTrue($output->page == 5);
}
// $queryTester->test_admin_deleteActionForward();
// $queryTester->test_module_insertModule();