From e571c8a1da231ecf2347d73e45793bcac63667e9 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 9 Dec 2020 10:40:11 +0800 Subject: [PATCH] * Fix bug. --- module/doc/control.php | 2 +- module/doc/model.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/module/doc/control.php b/module/doc/control.php index 745df6a152..b7f4aa2e79 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -772,7 +772,7 @@ class doc extends control } elseif($this->from == 'project') { - $this->lang->navGroup->doc = 'program'; + $this->lang->navGroup->doc = 'project'; $this->lang->doc->menu = $this->lang->project->menu; $this->lang->doc->menuOrder = $this->lang->project->menuOrder; $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID); diff --git a/module/doc/model.php b/module/doc/model.php index 34389a3277..3361670b20 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1199,6 +1199,7 @@ class docModel extends model { if($type != 'product' and $type != 'project') return false; $objectLibs = $this->dao->select('*')->from(TABLE_DOCLIB)->where('deleted')->eq(0)->andWhere($type)->eq($objectID)->orderBy('`order`, id')->fetchAll('id'); + if($type == 'product') { $hasProject = $this->dao->select('DISTINCT t1.product, count(t1.project) as projectCount')->from(TABLE_PROJECTPRODUCT)->alias('t1') @@ -1219,6 +1220,13 @@ class docModel extends model $itemCounts = $this->statLibCounts(array_keys($libs)); foreach($libs as $libID => $lib) $libs[$libID]->allCount = $itemCounts[$libID]; + if(common::hasPriv('doc', 'showFiles')) + { + $libs['files'] = new stdclass(); + $libs['files']->name = $this->lang->doclib->files; + $libs['files']->allCount = count($this->getLibFiles($type, $objectID, 'id_desc')); + } + return $libs; }