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

Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240

Browse Source
This commit is contained in:
wangyidong
2022-09-29 09:50:49 +08:00
parent 1e928ed625 a12d3229b3
commit 9c83ba7cae
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/router.class.php
+1 -1
View File
@@ -224,7 +224,7 @@ class router extends baseRouter
/* User preference init. */
$config->URSR = $URSR;
$config->URAndSR = $URAndSR;
$config->URAndSR = $URAndSR && strpos(",{$disabledFeatures},", ',URStory,') === false;
$config->programLink = 'program-browse';
$config->productLink = 'product-all';
$config->projectLink = 'project-browse';
module/custom/model.php
+11 -2
View File
@@ -847,11 +847,16 @@ class customModel extends model
->andWhere('acl')->eq('program')
->fetchGroup('parent', 'id');
$programs = $this->dao->select("id,CONCAT(PM,',',openedBy)")->from(TABLE_PROGRAM)
$programPM = $this->dao->select("id,PM")->from(TABLE_PROGRAM)
->where('id')->in(array_keys($projectGroup))
->andWhere('type')->eq('program')
->fetchPairs();
$stakeholders = $this->dao->select('*')->from(TABLE_STAKEHOLDER)
->where('objectType')->eq('program')
->andWhere('objectID')->in(array_keys($projectGroup))
->fetchGroup('objectID', 'user');
$projectIDList = array();
foreach($projectGroup as $projects) $projectIDList = array_merge($projectIDList, array_keys($projects));
$executionGroup = $this->dao->select('project,id')->from(TABLE_EXECUTION)->where('project')->in($projectIDList)->fetchGroup('project', 'id');
@@ -863,7 +868,11 @@ class customModel extends model
{
foreach($projects as $project)
{
$whitelist = rtrim($project->whitelist . ',' . zget($programs, $project->parent, ''));
$PM = zget($programPM, $project->parent, '');
$stakeholder = zget($stakeholders, $project->parent, '');
if($stakeholder) $stakeholder = join(',', array_keys($stakeholder));
$whitelist = rtrim($project->whitelist . ',' . $PM . ',' . $stakeholder);
$whitelist = explode(',', $whitelist);
$whitelist = array_filter(array_unique($whitelist));
$whitelist = join(',', $whitelist);
module/upgrade/control.php
+2
View File
@@ -171,6 +171,8 @@ class upgrade extends control
$this->upgrade->upgradeInProjectMode($programID, $systemMode);
$this->loadModel('custom')->disableFeaturesByMode($mode);
$selectMode = false;
}
if(version_compare($openVersion, '18_0', '>=')) $selectMode = false;