* adjust the code.
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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')
|
||||
|
||||
Reference in New Issue
Block a user