mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-26 06:39:56 +09:00
issue 160 document count with temp document in admin document list
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9249 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
97aea3e3eb
commit
7828df256a
2 changed files with 13 additions and 1 deletions
|
|
@ -200,7 +200,7 @@
|
||||||
$args->end_date = $obj->end_date?$obj->end_date:null;
|
$args->end_date = $obj->end_date?$obj->end_date:null;
|
||||||
$args->member_srl = $obj->member_srl;
|
$args->member_srl = $obj->member_srl;
|
||||||
$args->statusList = $obj->statusList?$obj->statusList:array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
|
$args->statusList = $obj->statusList?$obj->statusList:array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
|
||||||
if($logged_info->is_admin == 'Y') $args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
|
if($logged_info->is_admin == 'Y') $args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
|
||||||
// Category is selected, further sub-categories until all conditions
|
// Category is selected, further sub-categories until all conditions
|
||||||
if($args->category_srl) {
|
if($args->category_srl) {
|
||||||
$category_list = $this->getCategoryList($args->module_srl);
|
$category_list = $this->getCategoryList($args->module_srl);
|
||||||
|
|
@ -324,6 +324,7 @@
|
||||||
$output->page = $page_navigation->cur_page;
|
$output->page = $page_navigation->cur_page;
|
||||||
} else {
|
} else {
|
||||||
$output = executeQueryArray($query_id, $args, $columnList);
|
$output = executeQueryArray($query_id, $args, $columnList);
|
||||||
|
debugPrint($output->get('_query'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Return if no result or an error occurs
|
// Return if no result or an error occurs
|
||||||
|
|
|
||||||
11
modules/module/queries/getModuleListByInstance.xml
Normal file
11
modules/module/queries/getModuleListByInstance.xml
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
<query id="getModuleListByInstance" action="select">
|
||||||
|
<tables>
|
||||||
|
<table name="modules" />
|
||||||
|
</tables>
|
||||||
|
<columns>
|
||||||
|
<column name="*" />
|
||||||
|
</columns>
|
||||||
|
<groups>
|
||||||
|
<group column="module" />
|
||||||
|
</groups>
|
||||||
|
</query>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue