From 7828df256a273bbfed8095d6adfa53938345e11f Mon Sep 17 00:00:00 2001 From: ovclas Date: Wed, 21 Sep 2011 05:10:27 +0000 Subject: [PATCH] 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 --- modules/document/document.model.php | 3 ++- modules/module/queries/getModuleListByInstance.xml | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 modules/module/queries/getModuleListByInstance.xml diff --git a/modules/document/document.model.php b/modules/document/document.model.php index e595432f6..24af905bf 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -200,7 +200,7 @@ $args->end_date = $obj->end_date?$obj->end_date:null; $args->member_srl = $obj->member_srl; $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 if($args->category_srl) { $category_list = $this->getCategoryList($args->module_srl); @@ -324,6 +324,7 @@ $output->page = $page_navigation->cur_page; } else { $output = executeQueryArray($query_id, $args, $columnList); + debugPrint($output->get('_query')); } } // Return if no result or an error occurs diff --git a/modules/module/queries/getModuleListByInstance.xml b/modules/module/queries/getModuleListByInstance.xml new file mode 100644 index 000000000..f668b74ea --- /dev/null +++ b/modules/module/queries/getModuleListByInstance.xml @@ -0,0 +1,11 @@ + + + + + + + + + + +