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

Merge branch 'ztflow-hufangzhou-main#hufangzhou' of zentao/zentaopms (#56)

Browse Source
This commit is contained in:
胡方舟
2024-06-11 07:06:24 +00:00
committed by Gitfox
parent 3bc76f3379 06f2ec6e57
commit d2da3278c8
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+1 -2
View File
@@ -682,8 +682,7 @@ class doc extends control
$lib = $this->doc->getLibByID((int)$doc->lib);
if(!empty($lib) && $lib->deleted == '1') $appendLib = $doc->lib;
if($this->app->tab == 'doc' && $lib->type == 'execution') $appendLib = $doc->lib;
if($this->app->tab == 'doc' && !empty($lib) && $lib->type == 'execution') $appendLib = $doc->lib;
$objectType = isset($lib->type) ? $lib->type : 'custom';
$objectID = zget($doc, $objectType, 0);
module/doc/model.php
+2 -2
View File
@@ -1217,7 +1217,7 @@ class docModel extends model
if(!isset($doc->lib)) return false;
/* Asset document don't check privilege. */
if(isset($doc->assetLibType) && $doc->assetLibType) return true;
if((isset($doc->assetLibType) && $doc->assetLibType) || $doc->type == 'article') return true;
/* My document are accessible only to the creator. */
if($doc->status == 'draft' && $doc->addedBy != $this->app->user->account) return false;
@@ -1443,7 +1443,7 @@ class docModel extends model
->groupBy('root')
->fetchPairs();
$docs = $this->dao->select("`id`,`addedBy`,`lib`,`acl`,`users`,`groups`,`status`")->from(TABLE_DOC)
$docs = $this->dao->select("`id`,`addedBy`,`type`,`lib`,`acl`,`users`,`groups`,`status`")->from(TABLE_DOC)
->where('lib')->in($idList)
->andWhere('deleted')->eq(0)
->andWhere('module')->eq(0)
module/doc/test/model/checkprivdoc.php
+4 -1
View File
@@ -28,13 +28,14 @@ $docTable = zenData('doc')->loadYaml('doc');
$docTable->assetLibType->range('practice,component,[]{18}');
$docTable->users->range('user1');
$docTable->addedBy->range('admin{5},user1,admin{14}');
$docTable->type->range('text{19},article');
$docTable->gen(20);
zenData('doclib')->loadYaml('doclib')->gen(20);
zenData('user')->gen(5);
$users = array('admin', 'user1');
$docIds = array(0, 1, 3, 6, 12, 14);
$docIds = array(0, 1, 3, 6, 12, 14, 20);
$docTester = new docTest();
@@ -45,6 +46,7 @@ r($docTester->checkPrivDocTest($users[0], $docIds[2])) && p() && e('1'); // 检
r($docTester->checkPrivDocTest($users[0], $docIds[3])) && p() && e('0'); // 检查管理员对于非他创建的草稿文档权限
r($docTester->checkPrivDocTest($users[0], $docIds[4])) && p() && e('1'); // 检查管理员对于有权限查看文档库下的文档权限
r($docTester->checkPrivDocTest($users[0], $docIds[5])) && p() && e('1'); // 检查管理员对于自定义文档的权限
r($docTester->checkPrivDocTest($users[0], $docIds[6])) && p() && e('1'); // 检查管理员对于文档模板权限
/* Check user1 privilege. */
r($docTester->checkPrivDocTest($users[1], $docIds[0])) && p() && e('0'); // 检查普通用户user1对于没有libID文档权限
@@ -53,3 +55,4 @@ r($docTester->checkPrivDocTest($users[1], $docIds[2])) && p() && e('0'); // 检
r($docTester->checkPrivDocTest($users[1], $docIds[3])) && p() && e('0'); // 检查普通用户user1对于非他创建的草稿文档权限
r($docTester->checkPrivDocTest($users[1], $docIds[4])) && p() && e('0'); // 检查普通用户user1对于有权限查看文档库下的文档权限
r($docTester->checkPrivDocTest($users[1], $docIds[5])) && p() && e('0'); // 检查普通用户user1对于自定义文档的权限
r($docTester->checkPrivDocTest($users[1], $docIds[6])) && p() && e('1'); // 检查普通用户对于文档模板权限