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

* Fix bug #34066.

Browse Source
This commit is contained in:
tianshujie
2023-04-12 10:57:08 +08:00
parent 4ece1e7e79
commit b8fc22feee
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+1 -1
View File
@@ -1306,7 +1306,7 @@ class actionModel extends model
$shadowProducts = $this->dao->select('id')->from(TABLE_PRODUCT)->where('shadow')->eq(1)->fetchPairs();
$projectMultiples = $this->dao->select('id,type,multiple')->from(TABLE_PROJECT)->where('id')->in($projectIdList)->fetchAll('id');
$docList = $this->loadModel('doc')->getPrivDocs();
$docList = $this->loadModel('doc')->getPrivDocs('', 0, 'all');
$apiList = $this->loadModel('api')->getPrivApis();
$docLibList = $this->doc->getLibs('hasApi');
module/api/model.php
+14 -2
View File
@@ -1035,14 +1035,26 @@ class apiModel extends model
/**
* Get priv Apis..
*
* @param string $mode all
* @access public
* @return array
*/
public function getPrivApis()
public function getPrivApis($mode = '')
{
$libs = $this->loadModel('doc')->getLibs('api');
$libs = $this->dao->select('*')->from(TABLE_DOCLIB)
->where('type')->eq('api')
->andWhere('vision')->eq($this->config->vision)
->fetchAll('id');
$this->loadModel('doc');
foreach($libs as $libID => $lib)
{
if(!$this->doc->checkPrivLib($lib)) unset($libs[$libID]);
}
return $this->dao->select('id')->from(TABLE_API)
->where('lib')->in(array_keys($libs))
->beginIF($mode != 'all')->andWhere('deleted')->eq(0)->fi()
->fetchAll('id');
}
}
module/doc/model.php
+10 -7
View File
@@ -78,10 +78,10 @@ class docModel extends model
if($type == 'all' or $type == 'includeDeleted')
{
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
->where('type')->ne('api')
->where('vision')->eq($this->config->vision)
->beginIF($type == 'all')->andWhere('deleted')->eq(0)->fi()
->beginIF($type != 'hasApi')->andWhere('type')->ne('api')->fi()
->beginIF($excludeType)->andWhere('type')->notin($excludeType)->fi()
->andWhere('vision')->eq($this->config->vision)
->orderBy('id_asc')
->query();
}
@@ -3085,15 +3085,18 @@ class docModel extends model
if($type != 'project') $libTree = array_values($libTree[$type]);
if($type == 'mine')
{
$libType = zget($this->app->rawParams, 'type', '');
$libType = strtolower($libType);
$myLib = new stdclass();
$myLib->id = 0;
$myLib->name = $this->lang->doc->myLib;
$myLib->type = 'min';
$myLib->type = 'mine';
$myLib->objectType = 'doc';
$myLib->objectID = 0;
$myLib->active = 0;
$myLib->hasAction = false;
$myLib->active = zget($this->app->rawParams, 'type', '') == 'mine' ? 1 : 0;
$myLib->active = $libType == 'mine' ? 1 : 0;
$myLib->children = $libTree;
$myView = new stdclass();
@@ -3103,7 +3106,7 @@ class docModel extends model
$myView->objectType = 'doc';
$myView->objectID = 0;
$myView->hasAction = false;
$myView->active = zget($this->app->rawParams, 'type', '') == 'view' ? 1 : 0;
$myView->active = $libType ? 1 : 0;
$myCollection = new stdclass();
$myCollection->id = 0;
@@ -3112,7 +3115,7 @@ class docModel extends model
$myCollection->objectType = 'doc';
$myCollection->objectID = 0;
$myCollection->hasAction = false;
$myCollection->active = zget($this->app->rawParams, 'type', '') == 'collect' ? 1 : 0;
$myCollection->active = $libType ? 1 : 0;
$myCreation = new stdclass();
$myCreation->id = 0;
@@ -3121,7 +3124,7 @@ class docModel extends model
$myCreation->objectType = 'doc';
$myCreation->objectID = 0;
$myCreation->hasAction = false;
$myCreation->active = zget($this->app->rawParams, 'type', '') == 'createdby' ? 1 : 0;
$myCreation->active = $libType == 'createdby' ? 1 : 0;
$libTree = array();
$libTree[] = $myLib;