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

Merge branch release/22.0.alpha1 of zentao/zentaopms (#13116)

Browse Source
This commit is contained in:
刘刚
2026-01-04 17:17:14 +08:00
committed by Gitfox
parent d77e7869fe 135b75c2b4
commit 63232e34b9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/zentaopms.php
+2 -2
View File
@@ -761,8 +761,8 @@ $config->pgsqlDriverList = array('postgres', 'highgo', 'kingbase');
/* Program privs.*/
$config->programPriv = new stdclass();
$config->programPriv->noSprint = array('task', 'story', 'requirement', 'epic', 'tree', 'project', 'execution', 'projectbuild', 'bug', 'testcase', 'testtask', 'testreport', 'doc', 'repo', 'stakeholder', 'projectrelease', 'issue', 'risk', 'opportunity', 'meeting', 'pssp', 'auditplan', 'nc', 'review', 'reviewissue', 'weekly');
$config->programPriv->scrum = array('story', 'requirement', 'epic', 'productplan', 'tree', 'projectplan', 'projectstory', 'projectrelease', 'project', 'execution', 'projectbuild', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask', 'issue', 'risk', 'opportunity', 'weekly');
$config->programPriv->waterfall = array_merge($config->programPriv->scrum, array('workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'cm', 'projectchange', 'milestone', 'design', 'measrecord', 'auditplan', 'nc', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport'));
$config->programPriv->scrum = array('story', 'requirement', 'epic', 'productplan', 'tree', 'projectplan', 'projectstory', 'projectrelease', 'project', 'execution', 'projectbuild', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask', 'issue', 'risk', 'opportunity', 'weekly', 'review', 'reviewissue');
$config->programPriv->waterfall = array_merge($config->programPriv->scrum, array('workestimation', 'durationestimation', 'budget', 'programplan', 'cm', 'projectchange', 'milestone', 'design', 'measrecord', 'auditplan', 'nc', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport'));
$config->programPriv->agileplus = $config->programPriv->scrum;
$config->programPriv->waterfallplus = $config->programPriv->waterfall;
$config->programPriv->ipd = $config->programPriv->waterfall;
module/common/model.php
+1 -1
View File
@@ -2611,7 +2611,7 @@ eof;
if(!empty($actionData['notLoadModel']) && $moduleName != $rawModule) $moduleName = $rawModule;
if(!isset($this->$moduleName)) $this->loadModel($moduleName);
if(isset($this->$moduleName) && method_exists($this->{$moduleName}, 'isClickable') && false === $this->{$moduleName}->isClickable($data, $action)) return false;
if(empty($actionData['isClickable']) && isset($this->$moduleName) && method_exists($this->{$moduleName}, 'isClickable') && false === $this->{$moduleName}->isClickable($data, $action)) return false;
if(!empty($actionData['hint']) && !isset($actionData['text'])) $actionData['text'] = $actionData['hint'];
if($menu == 'suffixActions' && !empty($actionData['text']) && empty($actionData['showText'])) $actionData['text'] = '';