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

Merge branch 'revert-3e9bcdb8' into 'master'

Browse Source 
Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"

See merge request easycorp/zentaopms!1328
This commit is contained in:
王怡栋
2022-01-11 00:43:35 +00:00
parent 19fc483611 b57562e99e
commit 9f778e38b5
4 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/common/model.php
View File

@@ -528,7 +528,7 @@ class commonModel extends model
$attr = "class='iframe' data-width='650px'"; $attr = "class='iframe' data-width='650px'";
break; break;
case 'project': case 'project':
if(!defined('TUTORIAL')) if(isset($config->maxVersion) and!defined('TUTORIAL'))
{ {
$params = "programID=0&copyProjectID=0&extra=from=global"; $params = "programID=0&copyProjectID=0&extra=from=global";
$createMethod = 'createGuide'; $createMethod = 'createGuide';

1
module/project/lang/en.php
View File

@@ -220,7 +220,6 @@ $lang->project->currencySymbol['SGD'] = 'S$';
$lang->project->modelList['scrum'] = "Scrum"; $lang->project->modelList['scrum'] = "Scrum";
$lang->project->modelList['waterfall'] = "CMMI"; $lang->project->modelList['waterfall'] = "CMMI";
$lang->project->modelList['kanban'] = "Kanban";
$lang->project->featureBar['all'] = 'All'; $lang->project->featureBar['all'] = 'All';
$lang->project->featureBar['doing'] = 'Going'; $lang->project->featureBar['doing'] = 'Going';

1
module/project/lang/zh-cn.php
View File

@@ -220,7 +220,6 @@ $lang->project->currencySymbol['SGD'] = 'S$';
$lang->project->modelList['scrum'] = "Scrum"; $lang->project->modelList['scrum'] = "Scrum";
$lang->project->modelList['waterfall'] = "瀑布"; $lang->project->modelList['waterfall'] = "瀑布";
$lang->project->modelList['kanban'] = "看板";
$lang->project->featureBar['all'] = '所有'; $lang->project->featureBar['all'] = '所有';
$lang->project->featureBar['doing'] = '进行中'; $lang->project->featureBar['doing'] = '进行中';

2
module/project/model.php
View File

@@ -632,7 +632,7 @@ class projectModel extends model
/** /**
* Get project pairs by model and project. * Get project pairs by model and project.
* *
* @param string $model all|scrum|waterfall|kanban * @param string $model all|scrum|waterfall
* @param int $programID * @param int $programID
* @access public * @access public
* @return array * @return array