From 03da1bcf644a55a6a74aa7c2918c50e468a46f67 Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Mon, 26 Sep 2022 03:05:28 +0000 Subject: [PATCH 1/4] * Optimize code for review code. --- module/project/model.php | 10 +++++----- module/user/model.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/project/model.php b/module/project/model.php index 116239aebc..97eef3965b 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2503,7 +2503,7 @@ class projectModel extends model if($project->type == 'project') { - $modal = $project->model; + $model = $project->model; $projectID = $project->id; $executionID = $this->dao->select('id')->from(TABLE_EXECUTION) ->where('project')->eq($projectID) @@ -2514,7 +2514,7 @@ class projectModel extends model } else { - $modal = $project->type == 'kanban' ? 'kanban' : 'scrum'; + $model = $project->type == 'kanban' ? 'kanban' : 'scrum'; $executionID = $project->id; $projectID = $project->project; } @@ -2527,9 +2527,9 @@ class projectModel extends model $_COOKIE['tab'] = 'project'; $navGroup = zget($this->lang->navGroup, $moduleName); - $this->lang->$navGroup->menu = $this->lang->noSprint->{$modal}->menu; - $this->lang->$navGroup->menuOrder = $this->lang->noSprint->{$modal}->menuOrder; - $this->lang->$navGroup->dividerMenu = $this->lang->noSprint->{$modal}->dividerMenu; + $this->lang->$navGroup->menu = $this->lang->noSprint->{$model}->menu; + $this->lang->$navGroup->menuOrder = $this->lang->noSprint->{$model}->menuOrder; + $this->lang->$navGroup->dividerMenu = $this->lang->noSprint->{$model}->dividerMenu; foreach($this->lang->$navGroup->menu as $label => $menu) { diff --git a/module/user/model.php b/module/user/model.php index 53187d0488..e7ca37c431 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -2975,7 +2975,7 @@ class userModel extends model */ public function processAccountSort($users = array()) { - if(isset($this->app->user->account) && isset($users[$this->app->user->account])) + if(isset($this->app->user->account) and isset($users[$this->app->user->account])) { $currentUser = array(); $currentUser[$this->app->user->account] = $users[$this->app->user->account]; From f1d51e5a0dcdb8fcdcdc20343090b3e3042dbffc Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Mon, 26 Sep 2022 06:02:47 +0000 Subject: [PATCH 2/4] * Finish task #70191. --- module/upgrade/css/to18guide.css | 3 +- module/upgrade/view/to18guide.html.php | 198 +++++++++++++------------ 2 files changed, 102 insertions(+), 99 deletions(-) diff --git a/module/upgrade/css/to18guide.css b/module/upgrade/css/to18guide.css index 56221c51cc..9e206b7d42 100644 --- a/module/upgrade/css/to18guide.css +++ b/module/upgrade/css/to18guide.css @@ -1,4 +1,5 @@ -.panel {width: 1200px; margin: auto; padding: 0px 40px 40px 40px;} +.modal-dialog {width: 1200px;} +.panel {padding: 0px 40px 40px 40px;} .panel h1 {margin-top: 20px; margin-bottom: 20px;} .panel .icon {font-size: 20px;} diff --git a/module/upgrade/view/to18guide.html.php b/module/upgrade/view/to18guide.html.php index f1e316b327..53bead6f5f 100644 --- a/module/upgrade/view/to18guide.html.php +++ b/module/upgrade/view/to18guide.html.php @@ -12,105 +12,107 @@ ?>
-
-
-

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
lang->upgrade->mode;?>lang->upgrade->to18Mode['lean'];?>lang->upgrade->to18Mode['new'];?>
lang->upgrade->usage;?>lang->upgrade->leanUsage;?>lang->upgrade->newUsage;?>
lang->upgrade->program;?>
lang->upgrade->productRR;?>
lang->upgrade->productUR;?>
lang->upgrade->productLine;?>
lang->upgrade->projectScrum;?>
lang->upgrade->scrumDetail;?>
lang->upgrade->projectWaterfall;?>
lang->upgrade->projectKanban;?>
lang->upgrade->execution;?>
lang->upgrade->assetlib;?>
lang->upgrade->oa;?>
lang->upgrade->selectUsage;?>
lang->upgrade->remark;?>lang->upgrade->remarkDesc;?>
+
+
+ +

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
lang->upgrade->mode;?>lang->upgrade->to18Mode['lean'];?>lang->upgrade->to18Mode['new'];?>
lang->upgrade->usage;?>lang->upgrade->leanUsage;?>lang->upgrade->newUsage;?>
lang->upgrade->program;?>
lang->upgrade->productRR;?>
lang->upgrade->productUR;?>
lang->upgrade->productLine;?>
lang->upgrade->projectScrum;?>
lang->upgrade->scrumDetail;?>
lang->upgrade->projectWaterfall;?>
lang->upgrade->projectKanban;?>
lang->upgrade->execution;?>
lang->upgrade->assetlib;?>
lang->upgrade->oa;?>
lang->upgrade->selectUsage;?>
lang->upgrade->remark;?>lang->upgrade->remarkDesc;?>
+
-
- + +
From 129bec2618986dd095bfd8e682aa8a28d26e626b Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Mon, 26 Sep 2022 06:44:02 +0000 Subject: [PATCH 3/4] * Finish task #70192. --- module/upgrade/css/mergeprogram.css | 1 + module/upgrade/lang/de.php | 35 ++++---- module/upgrade/lang/en.php | 35 ++++---- module/upgrade/lang/fr.php | 35 ++++---- module/upgrade/lang/vi.php | 21 ++--- module/upgrade/lang/zh-cn.php | 89 +++++++++++---------- module/upgrade/view/createprogram.html.php | 2 +- module/upgrade/view/mergebyline.html.php | 6 +- module/upgrade/view/mergebyproduct.html.php | 6 +- module/upgrade/view/mergebysprint.html.php | 6 +- 10 files changed, 132 insertions(+), 104 deletions(-) diff --git a/module/upgrade/css/mergeprogram.css b/module/upgrade/css/mergeprogram.css index dabd7c5c17..37d8ea2de3 100644 --- a/module/upgrade/css/mergeprogram.css +++ b/module/upgrade/css/mergeprogram.css @@ -16,6 +16,7 @@ div.divider {vertical-align: middle;} .main-row .side-col .nav li.active div a {background: #e3f2fd; color: #000; border-radius: 4px;} .main-row .side-col .nav li.currentPage div a {background: #006af1; color: #fff; border-radius: 4px;} .main-row .side-col .nav li div a {width: 80%; display: inline-block; padding: 5px 15px; margin-bottom: 5px;} +.main-row > [class*=" col-"], .main-row > [class*="-col"], .main-row > [class^=col-] {vertical-align: middle} #lineBox > .cell {height: 700px; overflow: scroll;} #source > .cell {padding: 0; position: relative; height: 700px;} diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php index a13b418967..bad6d868ea 100644 --- a/module/upgrade/lang/de.php +++ b/module/upgrade/lang/de.php @@ -71,6 +71,7 @@ $lang->upgrade->project = 'Iteration'; $lang->upgrade->repo = 'Repo'; $lang->upgrade->mergeRepo = 'Merge Repo'; $lang->upgrade->setProgram = 'Set the project to which the program belongs'; +$lang->upgrade->setProject = "Set the {$lang->executionCommon} to which the project belongs"; $lang->upgrade->dataMethod = 'Data migration method'; $lang->upgrade->selectMergeMode = 'Please select the data merging method'; $lang->upgrade->mergeMode = 'Data consolidation method : '; @@ -84,22 +85,24 @@ $lang->upgrade->fileName = 'File Name'; $lang->upgrade->next = 'Next'; $lang->upgrade->back = 'Back'; -$lang->upgrade->newProgram = 'Create'; -$lang->upgrade->editedName = 'New Name'; -$lang->upgrade->projectEmpty = 'Project must be not empty.'; -$lang->upgrade->mergeSummary = "Dear users, there are %s {$lang->productCommon} and %s {$lang->projectCommon} in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:"; -$lang->upgrade->mergeByProject = "Currently, the following two data migration methods are available. If the historical projects are long term, we suggest upgrading the historical projects as projects.
If the historical projects are short cycle, we suggest that the historical projects be upgraded as iterations."; -$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product."; -$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrad. Please create an index.'; -$lang->upgrade->needChangeEngine = 'The table engine needs to be replaced in this upgrade, Please go [Admin->System->TableEngine] page to replace engine.'; -$lang->upgrade->errorEngineInnodb = 'Your MySQL version is too low to support InnoDB data table engine. Please modify it to MyISAM and try again.'; -$lang->upgrade->duplicateProject = "Project name in the same program cannot be duplicate. Please adjust the duplicate names."; -$lang->upgrade->upgradeTips = "Historically deleted data cannot be upgraded, and restoration is not supported after the upgrade. Please be aware."; -$lang->upgrade->moveEXTFileFail = 'The migration file failed, please execute the above command and refresh!'; -$lang->upgrade->deleteDirTip = 'After the upgrade, the following folders will affect the use of system functions, please delete them.'; -$lang->upgrade->errorNoProduct = "Select the {$lang->productCommon} that you want to merge."; -$lang->upgrade->errorNoExecution = "Select the {$lang->projectCommon} that you want to merge."; -$lang->upgrade->moveExtFileTip = <<upgrade->newProgram = 'Create'; +$lang->upgrade->editedName = 'New Name'; +$lang->upgrade->projectEmpty = 'Project must be not empty.'; +$lang->upgrade->mergeSummary = "Dear users, there are %s in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:"; +$lang->upgrade->productCount = "%s {$lang->productCommon}"; +$lang->upgrade->projectCount = "%s {$lang->projectCommon}"; +$lang->upgrade->mergeByProject = "Currently, the following two data migration methods are available. If the historical projects are long term, we suggest upgrading the historical projects as projects.
If the historical projects are short cycle, we suggest that the historical projects be upgraded as iterations."; +$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product."; +$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrad. Please create an index.'; +$lang->upgrade->needChangeEngine = 'The table engine needs to be replaced in this upgrade, Please go [Admin->System->TableEngine] page to replace engine.'; +$lang->upgrade->errorEngineInnodb = 'Your MySQL version is too low to support InnoDB data table engine. Please modify it to MyISAM and try again.'; +$lang->upgrade->duplicateProject = "Project name in the same program cannot be duplicate. Please adjust the duplicate names."; +$lang->upgrade->upgradeTips = "Historically deleted data cannot be upgraded, and restoration is not supported after the upgrade. Please be aware."; +$lang->upgrade->moveEXTFileFail = 'The migration file failed, please execute the above command and refresh!'; +$lang->upgrade->deleteDirTip = 'After the upgrade, the following folders will affect the use of system functions, please delete them.'; +$lang->upgrade->errorNoProduct = "Select the {$lang->productCommon} that you want to merge."; +$lang->upgrade->errorNoExecution = "Select the {$lang->projectCommon} that you want to merge."; +$lang->upgrade->moveExtFileTip = <<The new version will be compatible with the extension mechanism of the historical customization/plug-in. You need to migrate the customization/plug-in related files to extension/custom, otherwise the customization/plug-in function will not be available.

Please confirm whether the system has been customized/plug-in. If no customization/plug-in has been done, you can uncheck the following files; Whether you have done customization/plug-in, you can also keep the file checked.

EOT; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 559301dd06..146b9ef183 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -71,6 +71,7 @@ $lang->upgrade->project = 'Iteration'; $lang->upgrade->repo = 'Repo'; $lang->upgrade->mergeRepo = 'Merge Repo'; $lang->upgrade->setProgram = 'Set the project to which the program belongs'; +$lang->upgrade->setProject = "Set the {$lang->executionCommon} to which the project belongs"; $lang->upgrade->dataMethod = 'Data migration method'; $lang->upgrade->selectMergeMode = 'Please select the data merging method'; $lang->upgrade->mergeMode = 'Data consolidation method : '; @@ -84,22 +85,24 @@ $lang->upgrade->fileName = 'File Name'; $lang->upgrade->next = 'Next'; $lang->upgrade->back = 'Back'; -$lang->upgrade->newProgram = 'Create'; -$lang->upgrade->editedName = 'New Name'; -$lang->upgrade->projectEmpty = 'Project must be not empty.'; -$lang->upgrade->mergeSummary = "Dear users, there are %s {$lang->productCommon} and %s {$lang->projectCommon} in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:"; -$lang->upgrade->mergeByProject = "Currently, the following two data migration methods are available. If the historical projects are long term, we suggest upgrading the historical projects as projects.
If the historical projects are short cycle, we suggest that the historical projects be upgraded as iterations."; -$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product."; -$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.'; -$lang->upgrade->needChangeEngine = 'The table engine needs to be replaced in this upgrade, Please go [Admin->System->TableEngine] page to replace engine.'; -$lang->upgrade->errorEngineInnodb = 'Your MySQL does not support InnoDB data table engine. Please modify it to MyISAM and try again.'; -$lang->upgrade->duplicateProject = "Project name in the same program cannot be duplicate. Please adjust the duplicate names."; -$lang->upgrade->upgradeTips = "Historically deleted data cannot be upgraded, and restoration is not supported after the upgrade. Please be aware."; -$lang->upgrade->moveEXTFileFail = 'The migration file failed, please execute the above command and refresh!'; -$lang->upgrade->deleteDirTip = 'After the upgrade, the following folders will affect the use of system functions, please delete them.'; -$lang->upgrade->errorNoProduct = "Select the {$lang->productCommon} that you want to merge."; -$lang->upgrade->errorNoExecution = "Select the {$lang->projectCommon} that you want to merge."; -$lang->upgrade->moveExtFileTip = <<upgrade->newProgram = 'Create'; +$lang->upgrade->editedName = 'New Name'; +$lang->upgrade->projectEmpty = 'Project must be not empty.'; +$lang->upgrade->mergeSummary = "Dear users, there are %s in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:"; +$lang->upgrade->productCount = "%s {$lang->productCommon}"; +$lang->upgrade->projectCount = "%s {$lang->projectCommon}"; +$lang->upgrade->mergeByProject = "Currently, the following two data migration methods are available. If the historical projects are long term, we suggest upgrading the historical projects as projects.
If the historical projects are short cycle, we suggest that the historical projects be upgraded as iterations."; +$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product."; +$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.'; +$lang->upgrade->needChangeEngine = 'The table engine needs to be replaced in this upgrade, Please go [Admin->System->TableEngine] page to replace engine.'; +$lang->upgrade->errorEngineInnodb = 'Your MySQL does not support InnoDB data table engine. Please modify it to MyISAM and try again.'; +$lang->upgrade->duplicateProject = "Project name in the same program cannot be duplicate. Please adjust the duplicate names."; +$lang->upgrade->upgradeTips = "Historically deleted data cannot be upgraded, and restoration is not supported after the upgrade. Please be aware."; +$lang->upgrade->moveEXTFileFail = 'The migration file failed, please execute the above command and refresh!'; +$lang->upgrade->deleteDirTip = 'After the upgrade, the following folders will affect the use of system functions, please delete them.'; +$lang->upgrade->errorNoProduct = "Select the {$lang->productCommon} that you want to merge."; +$lang->upgrade->errorNoExecution = "Select the {$lang->projectCommon} that you want to merge."; +$lang->upgrade->moveExtFileTip = <<The new version will be compatible with the extension mechanism of the historical customization/plug-in. You need to migrate the customization/plug-in related files to extension/custom, otherwise the customization/plug-in function will not be available.

Please confirm whether the system has been customized/plug-in. If no customization/plug-in has been done, you can uncheck the following files; Whether you have done customization/plug-in, you can also keep the file checked.

EOT; diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php index 9df258b5ad..a7bc68e1df 100644 --- a/module/upgrade/lang/fr.php +++ b/module/upgrade/lang/fr.php @@ -71,6 +71,7 @@ $lang->upgrade->project = 'Iteration'; $lang->upgrade->repo = 'Repo'; $lang->upgrade->mergeRepo = 'Merge Repo'; $lang->upgrade->setProgram = 'Set the project to which the program belongs'; +$lang->upgrade->setProject = "Set the {$lang->executionCommon} to which the project belongs"; $lang->upgrade->dataMethod = 'Data migration method'; $lang->upgrade->selectMergeMode = 'Please select the data merging method'; $lang->upgrade->mergeMode = 'Data consolidation method : '; @@ -84,22 +85,24 @@ $lang->upgrade->fileName = 'File Name'; $lang->upgrade->next = 'Next'; $lang->upgrade->back = 'Back'; -$lang->upgrade->newProgram = 'Create'; -$lang->upgrade->editedName = 'New Name'; -$lang->upgrade->projectEmpty = 'Project must be not empty.'; -$lang->upgrade->mergeSummary = "Dear users, there are %s {$lang->productCommon} and %s {$lang->projectCommon} in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:"; -$lang->upgrade->mergeByProject = "Currently, the following two data migration methods are available. If the historical projects are long term, we suggest upgrading the historical projects as projects.
If the historical projects are short cycle, we suggest that the historical projects be upgraded as iterations."; -$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product."; -$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.'; -$lang->upgrade->needChangeEngine = 'The table engine needs to be replaced in this upgrade, Please go [Admin->System->TableEngine] page to replace engine.'; -$lang->upgrade->errorEngineInnodb = 'Your MySQL does not support InnoDB data table engine. Please modify it to MyISAM and try again.'; -$lang->upgrade->duplicateProject = "Project name in the same program cannot be duplicate. Please adjust the duplicate names."; -$lang->upgrade->upgradeTips = "Historically deleted data cannot be upgraded, and restoration is not supported after the upgrade. Please be aware."; -$lang->upgrade->moveEXTFileFail = 'The migration file failed, please execute the above command and refresh!'; -$lang->upgrade->deleteDirTip = 'After the upgrade, the following folders will affect the use of system functions, please delete them.'; -$lang->upgrade->errorNoProduct = "Select the {$lang->productCommon} that you want to merge."; -$lang->upgrade->errorNoExecution = "Select the {$lang->projectCommon} that you want to merge."; -$lang->upgrade->moveExtFileTip = <<upgrade->newProgram = 'Create'; +$lang->upgrade->editedName = 'New Name'; +$lang->upgrade->projectEmpty = 'Project must be not empty.'; +$lang->upgrade->mergeSummary = "Dear users, there are %s in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:"; +$lang->upgrade->productCount = "%s {$lang->productCommon}"; +$lang->upgrade->projectCount = "%s {$lang->projectCommon}"; +$lang->upgrade->mergeByProject = "Currently, the following two data migration methods are available. If the historical projects are long term, we suggest upgrading the historical projects as projects.
If the historical projects are short cycle, we suggest that the historical projects be upgraded as iterations."; +$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product."; +$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.'; +$lang->upgrade->needChangeEngine = 'The table engine needs to be replaced in this upgrade, Please go [Admin->System->TableEngine] page to replace engine.'; +$lang->upgrade->errorEngineInnodb = 'Your MySQL does not support InnoDB data table engine. Please modify it to MyISAM and try again.'; +$lang->upgrade->duplicateProject = "Project name in the same program cannot be duplicate. Please adjust the duplicate names."; +$lang->upgrade->upgradeTips = "Historically deleted data cannot be upgraded, and restoration is not supported after the upgrade. Please be aware."; +$lang->upgrade->moveEXTFileFail = 'The migration file failed, please execute the above command and refresh!'; +$lang->upgrade->deleteDirTip = 'After the upgrade, the following folders will affect the use of system functions, please delete them.'; +$lang->upgrade->errorNoProduct = "Select the {$lang->productCommon} that you want to merge."; +$lang->upgrade->errorNoExecution = "Select the {$lang->projectCommon} that you want to merge."; +$lang->upgrade->moveExtFileTip = <<The new version will be compatible with the extension mechanism of the historical customization/plug-in. You need to migrate the customization/plug-in related files to extension/custom, otherwise the customization/plug-in function will not be available.

Please confirm whether the system has been customized/plug-in. If no customization/plug-in has been done, you can uncheck the following files; Whether you have done customization/plug-in, you can also keep the file checked.

EOT; diff --git a/module/upgrade/lang/vi.php b/module/upgrade/lang/vi.php index 67f2b06975..9a24d2a903 100644 --- a/module/upgrade/lang/vi.php +++ b/module/upgrade/lang/vi.php @@ -69,6 +69,7 @@ $lang->upgrade->project = 'Iteration'; $lang->upgrade->repo = 'Repo'; $lang->upgrade->mergeRepo = 'Merge Repo'; $lang->upgrade->setProgram = 'Set the project to which the program belongs'; +$lang->upgrade->setProject = "Set the {$lang->executionCommon} to which the project belongs"; $lang->upgrade->dataMethod = 'Data migration method'; $lang->upgrade->selectMergeMode = 'Please select the data merging method'; $lang->upgrade->mergeMode = 'Data consolidation method : '; @@ -82,15 +83,17 @@ $lang->upgrade->fileName = 'File Name'; $lang->upgrade->next = 'Next'; $lang->upgrade->back = 'Back'; -$lang->upgrade->newProgram = 'Create'; -$lang->upgrade->editedName = 'New Name'; -$lang->upgrade->projectEmpty = 'Project must be not empty.'; -$lang->upgrade->mergeSummary = "Dear users, there are %s {$lang->productCommon} and %s {$lang->projectCommon} in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:"; -$lang->upgrade->mergeByProject = "Currently, the following two data migration methods are available. If the historical projects are long term, we suggest upgrading the historical projects as projects.
If the historical projects are short cycle, we suggest that the historical projects be upgraded as iterations."; -$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product."; -$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.'; -$lang->upgrade->errorEngineInnodb = 'Your MySQL version is too low to support InnoDB data table engine. Please modify it to MyISAM and try again.'; -$lang->upgrade->duplicateProject = "Project name in the same program cannot be duplicate. Please adjust the duplicate names."; +$lang->upgrade->newProgram = 'Create'; +$lang->upgrade->editedName = 'New Name'; +$lang->upgrade->projectEmpty = 'Project must be not empty.'; +$lang->upgrade->mergeSummary = "Dear users, there are %s in your system waiting for Migration. By System Calculation, we recommend your migration plan as follows, you can also adjust according to your own situation:"; +$lang->upgrade->productCount = "%s {$lang->productCommon}"; +$lang->upgrade->projectCount = "%s {$lang->projectCommon}"; +$lang->upgrade->mergeByProject = "Currently, the following two data migration methods are available. If the historical projects are long term, we suggest upgrading the historical projects as projects.
If the historical projects are short cycle, we suggest that the historical projects be upgraded as iterations."; +$lang->upgrade->mergeRepoTips = "Merge the selected version library under the selected product."; +$lang->upgrade->needBuild4Add = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.'; +$lang->upgrade->errorEngineInnodb = 'Your MySQL version is too low to support InnoDB data table engine. Please modify it to MyISAM and try again.'; +$lang->upgrade->duplicateProject = "Project name in the same program cannot be duplicate. Please adjust the duplicate names."; $lang->upgrade->projectType['project'] = "Upgrade the historical {$lang->projectCommon} as a project"; $lang->upgrade->projectType['execution'] = "Upgrade the historical {$lang->projectCommon} as an execution"; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index f1d5dd5514..9e977ae893 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -41,24 +41,24 @@ $lang->upgrade->setStatusFile = '

升级之前请先完成下面的操

我已经仔细阅读上面提示且完成上述工作，继续更新

'; -$lang->upgrade->selectVersion = '选择版本'; -$lang->upgrade->continue = '继续'; -$lang->upgrade->noteVersion = "务必选择正确的版本，否则会造成数据丢失。"; -$lang->upgrade->fromVersion = '原来的版本'; -$lang->upgrade->toVersion = '升级到'; -$lang->upgrade->confirm = '确认要执行的SQL语句'; -$lang->upgrade->sureExecute = '确认执行'; -$lang->upgrade->upgradingTips = '正在升级中，请耐心等待，切勿刷新页面、断电、关机！'; -$lang->upgrade->forbiddenExt = '以下插件与新版本不兼容，已经自动禁用：'; -$lang->upgrade->updateFile = '需要更新附件信息。'; -$lang->upgrade->noticeSQL = '检查到你的数据库跟标准不一致，尝试修复失败。请执行以下SQL语句，再刷新页面检查。'; -$lang->upgrade->afterDeleted = '请执行上面命令删除文件， 删除后刷新！'; -$lang->upgrade->mergeProgram = '数据迁移'; -$lang->upgrade->mergeTips = '数据迁移提示'; -$lang->upgrade->toPMS15Guide = '禅道开源版15版本升级'; -$lang->upgrade->toPRO10Guide = '禅道专业版10版本升级'; -$lang->upgrade->toBIZ5Guide = '禅道企业版5版本升级'; -$lang->upgrade->toMAXGuide = '禅道旗舰版版本升级'; +$lang->upgrade->selectVersion = '选择版本'; +$lang->upgrade->continue = '继续'; +$lang->upgrade->noteVersion = "务必选择正确的版本，否则会造成数据丢失。"; +$lang->upgrade->fromVersion = '原来的版本'; +$lang->upgrade->toVersion = '升级到'; +$lang->upgrade->confirm = '确认要执行的SQL语句'; +$lang->upgrade->sureExecute = '确认执行'; +$lang->upgrade->upgradingTips = '正在升级中，请耐心等待，切勿刷新页面、断电、关机！'; +$lang->upgrade->forbiddenExt = '以下插件与新版本不兼容，已经自动禁用：'; +$lang->upgrade->updateFile = '需要更新附件信息。'; +$lang->upgrade->noticeSQL = '检查到你的数据库跟标准不一致，尝试修复失败。请执行以下SQL语句，再刷新页面检查。'; +$lang->upgrade->afterDeleted = '请执行上面命令删除文件， 删除后刷新！'; +$lang->upgrade->mergeProgram = '数据迁移'; +$lang->upgrade->mergeTips = '数据迁移提示'; +$lang->upgrade->toPMS15Guide = '禅道开源版15版本升级'; +$lang->upgrade->toPRO10Guide = '禅道专业版10版本升级'; +$lang->upgrade->toBIZ5Guide = '禅道企业版5版本升级'; +$lang->upgrade->toMAXGuide = '禅道旗舰版版本升级'; $lang->upgrade->line = '产品线'; $lang->upgrade->allLines = "所有{$lang->productCommon}线"; @@ -71,6 +71,7 @@ $lang->upgrade->project = '迭代'; $lang->upgrade->repo = '版本库'; $lang->upgrade->mergeRepo = '归并版本库'; $lang->upgrade->setProgram = '设置项目所属项目集'; +$lang->upgrade->setProject = "设置{$lang->executionCommon}所属项目"; $lang->upgrade->dataMethod = '数据迁移方式'; $lang->upgrade->selectMergeMode = '请选择数据归并方式'; $lang->upgrade->mergeMode = '数据归并方式：'; @@ -84,47 +85,49 @@ $lang->upgrade->fileName = '文件名称'; $lang->upgrade->next = '下一步'; $lang->upgrade->back = '上一步'; -$lang->upgrade->newProgram = '新建'; -$lang->upgrade->editedName = '调整后名称'; -$lang->upgrade->projectEmpty = '所属项目不能为空！'; -$lang->upgrade->mergeSummary = "尊敬的用户，您的系统中共有%s个{$lang->productCommon}，%s个{$lang->projectCommon}等待迁移。"; -$lang->upgrade->mergeByProject = "当前提供如下2种数据迁移方式，如果历史的项目都是长周期的，那么我们建议把历史的项目作为项目升级。
如果历史的项目都是短周期的，那么我们建议把历史的项目作为迭代升级。"; -$lang->upgrade->mergeRepoTips = "将选中的版本库归并到所选产品下。"; -$lang->upgrade->needBuild4Add = '本次升级需要创建索引。请到 [后台->系统->重建索引] 页面，重新创建索引。'; -$lang->upgrade->needChangeEngine = '本次升级需要更换表引擎， [后台->系统->表引擎] 页面更换引擎。'; -$lang->upgrade->errorEngineInnodb = '您当前的数据库不支持使用InnoDB数据表引擎，请修改为MyISAM后重试。'; -$lang->upgrade->duplicateProject = "同一个项目集内项目名称不能重复，请调整重名的项目名称"; -$lang->upgrade->upgradeTips = "历史删除数据不参与升级，升级后将不支持还原，请知悉"; -$lang->upgrade->moveEXTFileFail = '迁移文件失败， 请执行上面命令后刷新！'; -$lang->upgrade->deleteDirTip = '升级后，如下文件夹会影响系统功能的使用，请删除。'; -$lang->upgrade->errorNoProduct = "请选择需要归并的{$lang->productCommon}。"; -$lang->upgrade->errorNoExecution = "请选择需要归并的{$lang->projectCommon}。"; -$lang->upgrade->moveExtFileTip = <<upgrade->newProgram = '新建'; +$lang->upgrade->editedName = '调整后名称'; +$lang->upgrade->projectEmpty = '所属项目不能为空！'; +$lang->upgrade->mergeSummary = "尊敬的用户，您的系统中共有%s等待迁移。"; +$lang->upgrade->productCount = "%s个{$lang->productCommon}"; +$lang->upgrade->projectCount = "%s个{$lang->projectCommon}"; +$lang->upgrade->mergeByProject = "当前提供如下2种数据迁移方式，如果历史的{$lang->projectCommon}都是长周期的，那么我们建议把历史的{$lang->projectCommon}作为项目升级。
如果历史的{$lang->projectCommon}都是短周期的，那么我们建议把历史的{$lang->projectCommon}作为{$lang->executionCommon}升级。"; +$lang->upgrade->mergeRepoTips = "将选中的版本库归并到所选产品下。"; +$lang->upgrade->needBuild4Add = '本次升级需要创建索引。请到 [后台->系统->重建索引] 页面，重新创建索引。'; +$lang->upgrade->needChangeEngine = '本次升级需要更换表引擎， [后台->系统->表引擎] 页面更换引擎。'; +$lang->upgrade->errorEngineInnodb = '您当前的数据库不支持使用InnoDB数据表引擎，请修改为MyISAM后重试。'; +$lang->upgrade->duplicateProject = "同一个项目集内项目名称不能重复，请调整重名的项目名称"; +$lang->upgrade->upgradeTips = "历史删除数据不参与升级，升级后将不支持还原，请知悉"; +$lang->upgrade->moveEXTFileFail = '迁移文件失败， 请执行上面命令后刷新！'; +$lang->upgrade->deleteDirTip = '升级后，如下文件夹会影响系统功能的使用，请删除。'; +$lang->upgrade->errorNoProduct = "请选择需要归并的{$lang->productCommon}。"; +$lang->upgrade->errorNoExecution = "请选择需要归并的{$lang->projectCommon}。"; +$lang->upgrade->moveExtFileTip = <<新版本将对历史的定制/插件进行扩展机制兼容处理，需要将定制/插件相关的文件迁移到extension/custom下，否则定制/插件功能将无法使用。

请您确认系统是否有做过定制/插件，如没有做过定制/插件，可取消勾选如下文件；如果不清楚是否做过定制/插件，也可保持文件勾选。

EOT; $lang->upgrade->projectType['project'] = "把历史的{$lang->projectCommon}作为项目升级"; -$lang->upgrade->projectType['execution'] = "把历史的{$lang->projectCommon}作为迭代升级"; +$lang->upgrade->projectType['execution'] = "把历史的{$lang->projectCommon}作为{$lang->executionCommon}升级"; $lang->upgrade->createProjectTip = <<升级后历史的{$lang->projectCommon}一一对应新版本中的项目。

-

系统会根据历史{$lang->projectCommon}分别创建一个与该{$lang->projectCommon}同名的迭代，并将之前{$lang->projectCommon}的任务、需求、Bug等数据迁移至迭代中。

+

系统会根据历史{$lang->projectCommon}分别创建一个与该{$lang->projectCommon}同名的{$lang->executionCommon}，并将之前{$lang->projectCommon}的任务、需求、Bug等数据迁移至{$lang->executionCommon}中。

EOT; $lang->upgrade->createExecutionTip = <<系统会把历史的{$lang->projectCommon}作为迭代进行升级。

-

升级后历史的{$lang->projectCommon}数据将对应新版本中项目下的迭代。

+

系统会把历史的{$lang->projectCommon}作为{$lang->executionCommon}进行升级。

+

升级后历史的{$lang->projectCommon}数据将对应新版本中项目下的{$lang->executionCommon}。

EOT; $lang->upgrade->mergeModes = array(); -$lang->upgrade->mergeModes['project'] = '自动归并数据，将历史的项目作为项目升级'; -$lang->upgrade->mergeModes['execution'] = '自动归并数据，将历史的项目作为迭代升级'; +$lang->upgrade->mergeModes['project'] = "自动归并数据，将历史的{$lang->projectCommon}作为项目升级"; +$lang->upgrade->mergeModes['execution'] = "自动归并数据，将历史的{$lang->projectCommon}作为{$lang->executionCommon}升级"; $lang->upgrade->mergeModes['manually'] = '手工归并数据'; -$lang->upgrade->mergeProjectTip = '历史的项目将直接同步到新版本的项目中，同时系统将会根据历史项目分别创建一个与该项目同名的迭代，并将之前项目下的任务、需求、Bug等数据迁移至迭代中。'; -$lang->upgrade->mergeExecutionTip = '系统将自动按年创建项目，将历史的迭代数据按照年份归并到对应的项目下。'; -$lang->upgrade->createProgramTip = '同时系统将自动创建一个默认的项目集，将所有的项目都放在默认的项目集下。'; +$lang->upgrade->mergeProjectTip = "历史的{$lang->projectCommon}将直接同步到新版本的项目中，同时系统将会根据历史{$lang->projectCommon}分别创建一个与该{$lang->projectCommon}同名的{$lang->executionCommon}，并将之前{$lang->projectCommon}下的任务、需求、Bug等数据迁移至{$lang->executionCommon}中。"; +$lang->upgrade->mergeExecutionTip = "系统将自动按年创建项目，将历史的{$lang->projectCommon}数据按照年份归并到对应的项目下。"; +$lang->upgrade->createProgramTip = "同时系统将自动创建一个默认的项目集，将所有的{$lang->projectCommon}都放在默认的项目集下。"; $lang->upgrade->mergeManuallyTip = '可以手工选择数据归并的方式。'; include dirname(__FILE__) . '/version.php'; diff --git a/module/upgrade/view/createprogram.html.php b/module/upgrade/view/createprogram.html.php index 26fb4ef0e1..4bfa43ee30 100644 --- a/module/upgrade/view/createprogram.html.php +++ b/module/upgrade/view/createprogram.html.php @@ -5,7 +5,7 @@ '>upgrade->createExecutionTip?> - +
upgrade->setProgram;?>upgrade->setProject : $lang->upgrade->setProgram;?>
diff --git a/module/upgrade/view/mergebyline.html.php b/module/upgrade/view/mergebyline.html.php index 3a97cba865..2d9a7c570a 100644 --- a/module/upgrade/view/mergebyline.html.php +++ b/module/upgrade/view/mergebyline.html.php @@ -2,7 +2,11 @@
upgrade->mergeSummary, $noMergedProductCount, $noMergedSprintCount); + $content = ''; + if($noMergedProductCount) $content .= sprintf($lang->upgrade->productCount, $noMergedProductCount); + if($content) $content .= ','; + if($noMergedSprintCount) $content .= sprintf($lang->upgrade->projectCount, $noMergedSprintCount); + printf($lang->upgrade->mergeSummary, $content); echo '
' . $lang->upgrade->mergeByProject; ?>
diff --git a/module/upgrade/view/mergebyproduct.html.php b/module/upgrade/view/mergebyproduct.html.php index 4db735f898..c02ecc5259 100644 --- a/module/upgrade/view/mergebyproduct.html.php +++ b/module/upgrade/view/mergebyproduct.html.php @@ -4,7 +4,11 @@
upgrade->mergeSummary, $noMergedProductCount, $noMergedSprintCount); + $content = ''; + if($noMergedProductCount) $content .= sprintf($lang->upgrade->productCount, $noMergedProductCount); + if($content) $content .= ','; + if($noMergedSprintCount) $content .= sprintf($lang->upgrade->projectCount, $noMergedSprintCount); + printf($lang->upgrade->mergeSummary, $content); echo '
' . $lang->upgrade->mergeByProject; ?>
diff --git a/module/upgrade/view/mergebysprint.html.php b/module/upgrade/view/mergebysprint.html.php index bb0cf58e82..0ce539b84e 100644 --- a/module/upgrade/view/mergebysprint.html.php +++ b/module/upgrade/view/mergebysprint.html.php @@ -1,6 +1,10 @@
upgrade->mergeSummary, $noMergedProductCount, $noMergedSprintCount); + $content = ''; + if($noMergedProductCount) $content .= sprintf($lang->upgrade->productCount, $noMergedProductCount); + if($content) $content .= ','; + if($noMergedSprintCount) $content .= sprintf($lang->upgrade->projectCount, $noMergedSprintCount); + printf($lang->upgrade->mergeSummary, $content); echo '
' . $lang->upgrade->mergeByProject; ?>
From 3af041060fb30567c3370bc24088b95d02c0fbdb Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Mon, 26 Sep 2022 07:06:15 +0000 Subject: [PATCH 4/4] * Finish task #70194. --- module/custom/js/mode.js | 7 ++++++- module/custom/lang/de.php | 4 ++-- module/custom/lang/en.php | 4 ++-- module/custom/lang/fr.php | 4 ++-- module/custom/lang/vi.php | 2 ++ module/custom/lang/zh-cn.php | 4 ++-- module/custom/view/mode.html.php | 9 ++++----- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/module/custom/js/mode.js b/module/custom/js/mode.js index f5ad1b4fb4..2e3ba0a05d 100644 --- a/module/custom/js/mode.js +++ b/module/custom/js/mode.js @@ -2,7 +2,12 @@ $(function() { $('#modeTab').addClass('btn-active-text'); - $('[name=mode]').change(function(){$("#selectDefaultProgram").toggle($(this).val() == 'lean'); }); + $('[name=mode]').change(function() + { + $('#submit').prop('disabled', 'disabled'); + if(mode != $(this).val()) $('#submit').prop('disabled', ''); + $('#program').closest('tr').toggle(mode == 'new' && $(this).val() == 'lean'); + }); $(document).on('click', '#submit', function() diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index 43a1ff02c9..b2c99275fd 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -57,6 +57,8 @@ $lang->custom->dept = 'Dept'; $lang->custom->code = $lang->code; $lang->custom->setCode = 'Enable or Disable Code'; $lang->custom->execution = 'Execution'; +$lang->custom->defaultProgram = 'Default program'; +$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; @@ -295,5 +297,3 @@ $lang->custom->scrum->setConcept = 'Set concept'; $lang->custom->reviewRules['allpass'] = 'All passed'; $lang->custom->reviewRules['halfpass'] = 'More than half passed'; - -$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index b6f2b641b3..4afdf529e1 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -57,6 +57,8 @@ $lang->custom->dept = 'Dept'; $lang->custom->code = $lang->code; $lang->custom->setCode = 'Enable or Disable Code'; $lang->custom->execution = 'Execution'; +$lang->custom->defaultProgram = 'Default program'; +$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; @@ -295,5 +297,3 @@ $lang->custom->scrum->setConcept = 'Set concept'; $lang->custom->reviewRules['allpass'] = 'All passed'; $lang->custom->reviewRules['halfpass'] = 'More than half passed'; - -$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 7297b77d29..c021b83ea7 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -57,6 +57,8 @@ $lang->custom->dept = 'Dept'; $lang->custom->code = $lang->code; $lang->custom->setCode = 'Activer ou Désactiver le Code'; $lang->custom->execution = 'Execution'; +$lang->custom->defaultProgram = 'Default program'; +$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; @@ -295,5 +297,3 @@ $lang->custom->scrum->setConcept = 'Set concept'; $lang->custom->reviewRules['allpass'] = 'All passed'; $lang->custom->reviewRules['halfpass'] = 'More than half passed'; - -$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index 2d23c34019..2ff5ae5ab1 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -50,6 +50,8 @@ $lang->custom->convertRelationTitle = "Please firstly set the conversion factor if($config->systemMode == 'new') $lang->custom->execution = 'Execution'; if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; +$lang->custom->defaultProgram = 'Default program'; +$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index a93604106b..51c1be4458 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -57,6 +57,8 @@ $lang->custom->dept = '部门'; $lang->custom->code = $lang->code; $lang->custom->setCode = '是否启用代号'; $lang->custom->execution = '执行'; +$lang->custom->defaultProgram = '选择默认项目集'; +$lang->custom->switchModeHelper = '请选择一个默认项目集，后续在系统中新增的数据将关联在默认项目集下'; $lang->custom->unitList['efficiency'] = '工时/'; $lang->custom->unitList['manhour'] = '人时/'; @@ -295,5 +297,3 @@ $lang->custom->scrum->setConcept = '设置项目概念'; $lang->custom->reviewRules['allpass'] = '全部通过通过'; $lang->custom->reviewRules['halfpass'] = '半数以上通过通过'; - -$lang->custom->switchModeHelper = '请选择一个默认项目集，后续在系统中新增的数据将关联在默认项目集下'; diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php index 5661508113..feb9dfad2b 100644 --- a/module/custom/view/mode.html.php +++ b/module/custom/view/mode.html.php @@ -23,7 +23,7 @@ - + - - > - + + - +
custom->mode;?>custom->mode;?>

@@ -31,9 +31,8 @@

custom->defaultProgram;?>
custom->switch);?>custom->switch, 'disabled');?>