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

issue 1150 if category_srl setted, show error in paging

Browse source 
fixed it.


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10184 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-02-24 06:31:22 +00:00
parent 158c0ddd08
commit 71af07b263
2 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -586,6 +586,34 @@
$args->sort_index = $opt->sort_index; $args->sort_index = $opt->sort_index;
$args->order_type = $opt->order_type; $args->order_type = $opt->order_type;
if($opt->statusList) $args->statusList = $opt->statusList;
else
{
$logged_info = Context::get('logged_info');
if($logged_info->is_admin == 'Y' && !$args->module_srl)
{
$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
}
else
{
$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
}
}
// Category is selected, further sub-categories until all conditions
if($opt->category_srl)
{
$categoryList = $this->getCategoryList($opt->module_srl);
if(array_key_exists($opt->category_srl, $categoryList))
{
$categoryInfo = $categoryList[$opt->category_srl];
$args->categorySrlList = $categoryInfo->childs;
array_push($args->categorySrlList, $opt->category_srl);
}
}
// Guhanhu total number of the article search page // Guhanhu total number of the article search page
$output = executeQuery('document.getDocumentPage', $args); $output = executeQuery('document.getDocumentPage', $args);
$count = $output->data->count; $count = $output->data->count;

1
modules/document/queries/getDocumentPage.xml
View file

@ -7,6 +7,7 @@
</columns> </columns>
<conditions> <conditions>
<condition operation="equal" column="module_srl" var="module_srl" /> <condition operation="equal" column="module_srl" var="module_srl" />
<condition operation="in" column="category_srl" var="categorySrlList" pipe="and" />
<condition operation="more" column="comment_count" var="comment_count" filter="number" pipe="and" /> <condition operation="more" column="comment_count" var="comment_count" filter="number" pipe="and" />
<condition operation="less" column="comment_count" var="rev_comment_count" filter="number" pipe="and" /> <condition operation="less" column="comment_count" var="rev_comment_count" filter="number" pipe="and" />
<condition operation="more" column="voted_count" var="voted_count" filter="number" pipe="and" /> <condition operation="more" column="voted_count" var="voted_count" filter="number" pipe="and" />