From 6ac14da5d1a60909bb6ac45984a438d99a2adedc Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 3 Sep 2019 10:15:20 +0800 Subject: [PATCH] * finish task #6297. --- module/doc/model.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/module/doc/model.php b/module/doc/model.php index c2bfef3cb6..1a250d74f9 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -987,7 +987,7 @@ class docModel extends model * * @param string $appendLibs * @access public - * @return void + * @return array */ public function getAllLibGroups($appendLibs = '') { @@ -1051,9 +1051,11 @@ class docModel extends model if($hasFilesPriv) $productOrderLibs[$productID]['libs']['files'] = $this->lang->doclib->files; } } + $projects = $this->dao->select('id,name,status')->from(TABLE_PROJECT) ->where('id')->in(array_keys($projectLibs)) ->andWhere('deleted')->eq('0') + ->beginIF(strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('status')->notin('done,closed')->fi() ->orderBy('`order`_desc') ->fetchAll(); $projectOrderLibs = array(); @@ -1623,7 +1625,7 @@ class docModel extends model */ public function buildCreateButton4Doc() { - $libs = $this->getLibs('all'); + $libs = $this->getLibs('all', strpos($this->config->doc->custom->showLibs, 'unclosed') !== false ? 'unclosedProject' : ''); $html = ""; if($libs) {