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

Merge branch 'sprint/tsj_task' into 'master'

Browse Source 
Sprint/tsj task

See merge request easycorp/zentaopms!7009
This commit is contained in:
孙广明
2023-02-21 05:47:26 +00:00
parent 0745b389af 29e3eec34c
commit 777b20ebdc
38 changed files with 290 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/helper.class.php
+2 -2
View File
@@ -96,7 +96,7 @@ class helper extends baseHelper
}
else
{
if($feature == 'scrum' or $feature == 'waterfall') return strpos(",$config->disabledFeatures,", ",{$feature},") === false;
if(in_array($feature, array('scrum', 'waterfall', 'agileplus', 'waterfallplus'))) return strpos(",$config->disabledFeatures,", ",{$feature},") === false;
$hasFeature = false;
$canConfigFeature = false;
@@ -107,7 +107,7 @@ class helper extends baseHelper
if($feature == $group or $feature == $module)
{
$canConfigFeature = true;
if($group == 'scrum' or $group == 'waterfall')
if(in_array($group, array('scrum', 'waterfall', 'agileplus', 'waterfallplus')))
{
if(helper::hasFeature("{$group}") and helper::hasFeature("{$group}_{$module}")) $hasFeature = true;
}