From 305e8cd794ec5d176b3e55c19c8364b65ba58f85 Mon Sep 17 00:00:00 2001 From: lanzongjun Date: Tue, 20 Sep 2022 08:58:41 +0800 Subject: [PATCH] * finish task #69698#69703#69704#69705 --- db/update17.6.1.sql | 2 +- module/project/lang/de.php | 7 ++++++- module/project/lang/en.php | 7 ++++++- module/project/lang/fr.php | 7 ++++++- module/project/lang/zh-cn.php | 7 ++++++- module/project/view/create.html.php | 6 ++++++ module/project/view/edit.html.php | 6 ++++++ 7 files changed, 37 insertions(+), 5 deletions(-) diff --git a/db/update17.6.1.sql b/db/update17.6.1.sql index e8749557cf..f47a93a119 100644 --- a/db/update17.6.1.sql +++ b/db/update17.6.1.sql @@ -1 +1 @@ -ALTER table `zt_project` ADD `noExecution` enum('0', '1') NOT NULL DEFAULT '0'; +ALTER table `zt_project` ADD `noSprint` enum('0', '1') NOT NULL DEFAULT '0'; diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 6ba84626ed..fc739ee6f3 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -257,6 +257,9 @@ $lang->project->featureBar['build']['all'] = 'Build List'; $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)'; $lang->project->aclList['open'] = "Open (accessible with project view permissions)"; +$lang->project->noSprintList['0'] = "Disable"; +$lang->project->noSprintList['1'] = "Enable"; + $lang->project->acls['private'] = 'Private'; $lang->project->acls['open'] = "Open"; @@ -334,4 +337,6 @@ $lang->project->childLongTime = "If a child as long-term projects, the pa $lang->project->confirmUnlinkMember = "Do you want to remove this user from project?"; $lang->project->action = new stdclass(); -$lang->project->action->managed = '$date, managed by $actor. $extra' . "\n"; \ No newline at end of file +$lang->project->action->managed = '$date, managed by $actor. $extra' . "\n"; + +$lang->project->noSprint = 'No sprint'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 92ac76fba0..2d9fef9d84 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -257,6 +257,9 @@ $lang->project->featureBar['build']['all'] = 'Build List'; $lang->project->aclList['private'] = 'Private (For the project leader, team members and stakeholders only)'; $lang->project->aclList['open'] = "Open (accessible with project view permissions)"; +$lang->project->noSprintList['0'] = "Disable"; +$lang->project->noSprintList['1'] = "Enable"; + $lang->project->acls['private'] = 'Private'; $lang->project->acls['open'] = 'Open'; @@ -334,4 +337,6 @@ $lang->project->childLongTime = "There are long-term projects in the child $lang->project->confirmUnlinkMember = "Do you want to remove this user from project?"; $lang->project->action = new stdclass(); -$lang->project->action->managed = '$date, managed by $actor. $extra' . "\n"; \ No newline at end of file +$lang->project->action->managed = '$date, managed by $actor. $extra' . "\n"; + +$lang->project->noSprint = 'No sprint'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index c5f2bffc24..79717e537f 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -257,6 +257,9 @@ $lang->project->featureBar['build']['all'] = 'Build List'; $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)'; $lang->project->aclList['open'] = "Open (accessible with project view permissions)"; +$lang->project->noSprintList['0'] = "Disable"; +$lang->project->noSprintList['1'] = "Enable"; + $lang->project->acls['private'] = 'Private'; $lang->project->acls['open'] = "Open"; @@ -334,4 +337,6 @@ $lang->project->childLongTime = "If a child as long-term projects, the pa $lang->project->confirmUnlinkMember = "Do you want to remove this user from project?"; $lang->project->action = new stdclass(); -$lang->project->action->managed = '$date, managed by $actor. $extra' . "\n"; \ No newline at end of file +$lang->project->action->managed = '$date, managed by $actor. $extra' . "\n"; + +$lang->project->noSprint = 'No sprint'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 166cfc02de..eb8e8cd272 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -257,6 +257,9 @@ $lang->project->featureBar['build']['all'] = '所有版本'; $lang->project->aclList['private'] = "私有 (只有项目负责人、团队成员和干系人可访问)"; $lang->project->aclList['open'] = "公开 (有项目视图权限即可访问)"; +$lang->project->noSprintList['0'] = "不启用"; +$lang->project->noSprintList['1'] = "启用"; + $lang->project->acls['private'] = '私有'; $lang->project->acls['open'] = '公开'; @@ -334,4 +337,6 @@ $lang->project->childLongTime = "子项目中有长期项目，父项目 $lang->project->confirmUnlinkMember = "您确定从该项目中移除该用户吗？"; $lang->project->action = new stdclass(); -$lang->project->action->managed = '$date, 由 $actor 维护。$extra' . "\n"; \ No newline at end of file +$lang->project->action->managed = '$date, 由 $actor 维护。$extra' . "\n"; + +$lang->project->noSprint = '是否启用迭代'; diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 574aabb0a9..a5e6d73e73 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -73,6 +73,12 @@ + + + project->noSprint;?> + project->noSprintList, 1));?> + + project->PM;?> diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index 9bdbe15495..d9387e10bd 100755 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -77,6 +77,12 @@ code, "class='form-control' required");?> + + + project->noSprint;?> + project->noSprintList, $project->noSprint, 'disabled'));?> + + project->PM;?> PM, "class='form-control chosen'" . (strpos($requiredFields, 'PM') !== false ? ' required' : ''));?>