diff --git a/module/doc/control.php b/module/doc/control.php index 97b90b71b2..f417709ad4 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -265,9 +265,9 @@ class doc extends control if(!$doc) die(js::error($this->lang->notFound) . js::locate('back')); /* 文档库名称。*/ + $lib = $doc->libName; if($doc->lib == 'product') $lib = $doc->productName; - else if($doc->lib == 'project') $lib = $doc->productName . '/' . $doc->projectName; - else $lib = $doc->libName; + if($doc->lib == 'project') $lib = $doc->productName . $this->lang->arrow . $doc->projectName; /* 设置菜单。*/ $this->doc->setMenu($this->libs, $doc->lib); diff --git a/module/doc/model.php b/module/doc/model.php index dcfa145139..3d70d21933 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -179,10 +179,9 @@ class docModel extends model /* 获得某一个产品的文档列表。*/ public function getProductDocs($productID) { - return $this->dao->select('t1.*, t2.name') + return $this->dao->select('t1.*, t2.name as module') ->from(TABLE_DOC)->alias('t1') - ->leftjoin(TABLE_MODULE)->alias('t2') - ->on('t1.module = t2.id') + ->leftjoin(TABLE_MODULE)->alias('t2')->on('t1.module = t2.id') ->where('t1.product')->eq($productID) ->andWhere('t1.deleted')->eq(0) ->orderBy('t1.id_desc')