Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'tsj_docTree' into 'master'

Browse Source 
* Code for task #89915.

See merge request easycorp/zentaopms!7316
This commit is contained in:
王怡栋
2023-04-06 00:52:45 +00:00
parent 2525123024 c5d2bc5c17
commit eb1c1e2ee2
31 changed files with 464 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+31
View File
@@ -2810,6 +2810,21 @@ class docModel extends model
$item->type = $module->type == 'api' ? 'apiDoc' : $module->type;
$item->active = $module->id == $moduleID ? 1 : 0;
$item->children = $this->getModuleTree($rootID, $moduleID, $type, $module->id, $modules);
$showDoc = $this->loadModel('setting')->getItem('owner=' . $this->app->user->account . '&module=doc&key=showDoc');
$showDoc = $showDoc === '0' ? 0 : 1;
if($this->app->rawMethod == 'view' and $module->type != 'api' and $showDoc)
{
$docIDList = $this->getPrivDocs($rootID, $module->id);
$docs = $this->dao->select('*, title as name')->from(TABLE_DOC)
->where('id')->in($docIDList)
->andWhere('deleted')->eq(0)
->fetchAll('id');
if(!empty($docs))
{
$docs = array_values($docs);
$item->children = array_merge($docs, $item->children);
}
}
$moduleTree[$module->id] = $item;
}
@@ -2858,6 +2873,22 @@ class docModel extends model
$item->objectID = $objectID;
$item->active = $lib->id == $libID && $browseType != 'bySearch' ? 1 : 0;
$item->children = $this->getModuleTree($lib->id, $moduleID, $lib->type == 'api' ? 'api' : 'doc');
$showDoc = $this->loadModel('setting')->getItem('owner=' . $this->app->user->account . '&module=doc&key=showDoc');
$showDoc = $showDoc === '0' ? 0 : 1;
if($this->app->rawMethod == 'view' and $lib->type != 'api' and $showDoc)
{
$docIDList = $this->getPrivDocs($lib->id);
$docs = $this->dao->select('*, title as name')->from(TABLE_DOC)
->where('id')->in($docIDList)
->andWhere('deleted')->eq(0)
->andWhere('module')->eq(0)
->fetchAll('id');
if(!empty($docs))
{
$docs = array_values($docs);
$item->children = array_merge($docs, $item->children);
}
}
if(($type == 'project' and $lib->type != 'execution') or $type != 'project')
{
if($item->type == 'lib') $libTree[$lib->type][$lib->id] = $item;