From 11115204812d242f615b4d7cdfd4498c2f70c09f Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Thu, 3 Sep 2020 17:33:21 +0800 Subject: [PATCH] * Adjust doc browse. --- module/branch/control.php | 2 +- module/doc/model.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/branch/control.php b/module/branch/control.php index 9dd7de50a0..ec4ad4d98b 100644 --- a/module/branch/control.php +++ b/module/branch/control.php @@ -29,7 +29,7 @@ class branch extends control $products = $this->loadModel('product')->getPairs('nocode' , $this->session->program); $this->product->setMenu($products, $productID); - $position[] = html::a($this->createLink('product', 'browse', "productID=$productID"), $products[$productID]); + $position[] = html::a($this->createLink('product', 'browse', "productID=$productID"), zget($products, $productID)); $position[] = $this->lang->branch->manage; $this->view->title = $this->lang->branch->manage; diff --git a/module/doc/model.php b/module/doc/model.php index 2c87aacf72..7ce502dfc0 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1158,10 +1158,10 @@ class docModel extends model { if($this->checkPrivLib($lib)) $buildGroups[$objectID][$lib->id] = $lib->name; } - } - //if($type == 'product' and isset($hasProject[$objectID]) and common::hasPriv('doc', 'allLibs')) $buildGroups[$objectID]['project'] = $this->lang->doclib->project; - if(common::hasPriv('doc', 'showFiles')) $buildGroups[$objectID]['files'] = $this->lang->doclib->files; + //if($type == 'product' and isset($hasProject[$objectID]) and common::hasPriv('doc', 'allLibs')) $buildGroups[$objectID]['project'] = $this->lang->doclib->project; + if(common::hasPriv('doc', 'showFiles')) $buildGroups[$objectID]['files'] = $this->lang->doclib->files; + } return $buildGroups; }