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

Merge branch 'cyy_task' into 'master'

Browse Source 
Cyy task

See merge request easycorp/zentaopms!7355
This commit is contained in:
王怡栋
2023-04-11 06:05:51 +00:00
parent ba3d0c7647 5e5eb3396a
commit 857b57b6eb
11 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+15 -5
View File
@@ -182,8 +182,6 @@ class doc extends control
elseif($type == 'mine')
{
$acl = 'private';
unset($this->lang->doclib->aclList['open']);
unset($this->lang->doclib->aclList['default']);
$this->lang->doclib->aclList = $this->lang->doclib->mySpaceAclList['private'];
}
@@ -268,20 +266,28 @@ class doc extends control
$this->view->object = $execution;
}
if($lib->type == 'custom') unset($this->lang->doclib->aclList['default']);
if($lib->type == 'api')
if($lib->type == 'custom')
{
unset($this->lang->doclib->aclList['default']);
}
elseif($lib->type == 'api')
{
$this->app->loadLang('api');
$type = !empty($lib->product) ? 'product' : 'project';
$this->lang->api->aclList['default'] = sprintf($this->lang->api->aclList['default'], $this->lang->{$type}->common);
}
if($lib->type != 'custom')
elseif($lib->type == 'mine')
{
$this->lang->doclib->aclList = $this->lang->doclib->mySpaceAclList['private'];
}
elseif($lib->type != 'custom')
{
$type = isset($type) ? $type : $lib->type;
$this->lang->doclib->aclList['default'] = sprintf($this->lang->doclib->aclList['default'], $this->lang->{$type}->common);
$this->lang->doclib->aclList['private'] = sprintf($this->lang->doclib->privateACL, $this->lang->{$type}->common);
unset($this->lang->doclib->aclList['open']);
}
if(!empty($lib->main)) unset($this->lang->doclib->aclList['private'], $this->lang->doclib->aclList['open']);
$this->view->lib = $lib;
@@ -595,6 +601,10 @@ class doc extends control
{
$objects = $this->loadModel('product')->getPairs();
}
elseif($objectType == 'mine')
{
$this->lang->doc->aclList = $this->lang->doclib->mySpaceAclList['private'];
}
$moduleOptionMenu = $this->doc->getLibsOptionMenu($libs);
$this->config->showMainMenu = strpos(',html,markdown,text,', ",{$doc->type},") === false;