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

* Fix bug#15211,14525

Browse Source
This commit is contained in:
zenggang
2021-09-16 17:31:40 +08:00
parent 233f599d2a
commit ee07a042a4
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/view/all.html.php
+1 -1
View File
@@ -112,7 +112,7 @@
<?php endif;?>
<?php foreach($program as $lineID => $line):?>
<?php if(isset($line['lineName']) and !in_array($line['lineName'], $lineNames)):?>
<?php if(isset($line['lineName'])):?>
<?php $lineNames[] = $line['lineName'];?>
<?php
if($this->config->systemMode == 'new' and $programID)
module/program/model.php
+2 -1
View File
@@ -632,11 +632,12 @@ class programModel extends model
$whitelist = explode(',', $program->whitelist);
$this->loadModel('personnel')->updateWhitelist($whitelist, 'program', $programID);
if($program->acl != 'open') $this->loadModel('user')->updateUserView($programID, 'program');
$this->file->updateObjectID($this->post->uid, $programID, 'program');
$this->setTreePath($programID);
if($program->acl != 'open') $this->loadModel('user')->updateUserView($programID, 'program');
return $programID;
}
}
module/user/model.php
+6 -2
View File
@@ -1917,8 +1917,12 @@ class userModel extends model
$whiteList = zget($whiteListGroup, $program->id, array());
if($program->acl == 'program')
{
$stakeholders += zget($parentStakeholderGroup, $program->id, array());
$stakeholders += zget($parentPMGroup, $program->id, array());
$parentIds = explode(',', $program->path);
foreach($parentIds as $parentId)
{
$stakeholders += zget($parentStakeholderGroup, $parentId, array());
$stakeholders += zget($parentPMGroup, $parentId, array());
}
}
$authedUsers += $this->getProgramAuthedUsers($program, $stakeholders, $whiteList);
}