From 29c5cfe9897fc3df8ffc094952deaf9b2961a425 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 20 Apr 2021 13:39:29 +0800 Subject: [PATCH 1/5] * Fix the language item error. --- module/stakeholder/view/userissue.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/stakeholder/view/userissue.html.php b/module/stakeholder/view/userissue.html.php index 35d9e3baa4..7564f1f472 100644 --- a/module/stakeholder/view/userissue.html.php +++ b/module/stakeholder/view/userissue.html.php @@ -45,7 +45,7 @@ issue->typeList, $issue->type);?> issue->severityList, $issue->severity);?> pri;?> - issue->resolveMethods, $issue->status);?> + issue->statusList, $issue->status);?> createdDate;?> From d69021b8df09b7819b4039cecc214df6afd771c3 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Tue, 20 Apr 2021 13:55:08 +0800 Subject: [PATCH 2/5] * Fix bug. --- module/repo/view/diff.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/repo/view/diff.html.php b/module/repo/view/diff.html.php index a3bc6c237e..60e208f4f5 100644 --- a/module/repo/view/diff.html.php +++ b/module/repo/view/diff.html.php @@ -28,7 +28,7 @@
repo->createLink('browse', "repoID=$repoID"), $repo->name, '', "data-app='{$app->openApp}'"); + echo html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'"); $paths= explode('/', $entry); $fileName = array_pop($paths); $postPath = ''; From 6b7e3863666694acd4323f898bda4adcb395227e Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 20 Apr 2021 14:02:13 +0800 Subject: [PATCH 3/5] * Fix the project history note issue. --- module/project/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/config.php b/module/project/config.php index 985368c990..cea74baa0d 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -8,7 +8,7 @@ $config->project->editor->close = array('id' => 'comment', 'tools' => 'simple $config->project->editor->suspend = array('id' => 'comment', 'tools' => 'simpleTools'); $config->project->editor->start = array('id' => 'comment', 'tools' => 'simpleTools'); $config->project->editor->activate = array('id' => 'comment', 'tools' => 'simpleTools'); -$config->project->editor->view = array('id' => 'comment', 'tools' => 'simpleTools'); +$config->project->editor->view = array('id' => 'lastComment', 'tools' => 'simpleTools'); $config->project->list = new stdclass(); $config->project->list->exportFields = 'id,name,code,template,product,status,begin,end,budget,PM,end,desc'; From bb605c56f5590258343107cfcea7eb91e5b38c7f Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 20 Apr 2021 14:28:33 +0800 Subject: [PATCH 4/5] * Fix the report back link problem. --- module/execution/control.php | 12 ++++++------ module/execution/view/grouptask.html.php | 4 ++-- module/execution/view/tree.html.php | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index ff80468283..3a35f5ebbb 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -443,7 +443,7 @@ class execution extends control $this->view->browseType = 'group'; $this->view->groupBy = $groupBy; $this->view->orderBy = $groupBy; - $this->view->executionID = $executionID; + $this->view->executionID = $executionID; $this->view->users = $users; $this->view->moduleID = 0; $this->view->moduleName = $this->lang->tree->all; @@ -1873,11 +1873,11 @@ class execution extends control $this->view->title = $this->lang->execution->tree; $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name); - $this->view->position[] = $this->lang->execution->tree; - $this->view->execution = $execution; - $this->view->executionID = $executionID; - $this->view->level = $type; - $this->view->tree = $this->execution->printTree($tree); + $this->view->position[] = $this->lang->execution->tree; + $this->view->execution = $execution; + $this->view->executionID = $executionID; + $this->view->level = $type; + $this->view->tree = $this->execution->printTree($tree); $this->display(); } diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php index fd8c055a84..ca422382b0 100644 --- a/module/execution/view/grouptask.html.php +++ b/module/execution/view/grouptask.html.php @@ -38,9 +38,9 @@
diff --git a/module/execution/view/tree.html.php b/module/execution/view/tree.html.php index aef3be3ca3..e6a668cab2 100644 --- a/module/execution/view/tree.html.php +++ b/module/execution/view/tree.html.php @@ -27,7 +27,7 @@
createLink('task', 'report', "execution=$executionID&browseType=$browseType") : '#'; echo html::a($link, " {$lang->task->reportChart}", '', 'class="btn btn-link"'); From 9a2d565cce9626ba0f46cbbc80ab130883e15b13 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 20 Apr 2021 14:35:57 +0800 Subject: [PATCH 5/5] * Fix detail. --- module/upgrade/view/to15guide.html.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/module/upgrade/view/to15guide.html.php b/module/upgrade/view/to15guide.html.php index 39c5e9b440..e6dd742c3c 100644 --- a/module/upgrade/view/to15guide.html.php +++ b/module/upgrade/view/to15guide.html.php @@ -10,6 +10,14 @@ * @link http://www.zentao.net */ ?> +maxVersion)) +{ + unset($lang->upgrade->to15Mode['classic']); + $mode = 'new'; +} +?>
@@ -18,7 +26,7 @@
upgrade->to15Desc;?> - upgrade->to15Mode, 'classic');?> + upgrade->to15Mode, $mode);?>

upgrade->selectedModeTips['classic'];?>