From 7bbfaba1d691840a32dc62cb93963bd57766dfe1 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 30 Sep 2025 08:54:18 +0800 Subject: [PATCH 1/3] * [bug#65926,done,0.1h] modify next button link. --- module/upgrade/ui/upgradeprojectreports.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/upgrade/ui/upgradeprojectreports.html.php b/module/upgrade/ui/upgradeprojectreports.html.php index 4eb1978b67..6b8696865e 100644 --- a/module/upgrade/ui/upgradeprojectreports.html.php +++ b/module/upgrade/ui/upgradeprojectreports.html.php @@ -37,7 +37,7 @@ div ( setID('upgradeReportsBtn'), set::type('primary'), - set::url('upgrade', 'upgradeProjectReports', "fromVersion={$fromVersion}&processed=yes"), + set::url('upgrade', 'afterExec', "fromVersion={$fromVersion}&processed=no&skipMoveFile=yes&skipUpdateDocs=yes&skipUpdateDocTemplates=yes&skipUpdateProjectReports=yes"), on::click()->call('startUpgradeReports', jsRaw('event'), $upgradeReports, $lang->upgrade->upgradingProjectReports, $lang->upgrade->next), span(setClass('hidden as-upgrading-text'), $lang->upgrade->upgradingProjectReports), span(setClass('hidden as-finish-text'), $lang->upgrade->next), From 1abfa1755e0eb8a721effd7021e49356da05512e Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 30 Sep 2025 09:15:07 +0800 Subject: [PATCH 2/3] * [task#150364,done,0.1h] modify milestone language. --- module/weekly/lang/de.php | 2 +- module/weekly/lang/en.php | 2 +- module/weekly/lang/fr.php | 2 +- module/weekly/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/weekly/lang/de.php b/module/weekly/lang/de.php index 969b0caff1..81033b0e3f 100644 --- a/module/weekly/lang/de.php +++ b/module/weekly/lang/de.php @@ -51,7 +51,7 @@ $lang->weekly->builtInScopes['rnd']['project'] = 'Project'; $lang->weekly->builtInCategoryList['month'] = 'Monthly Report'; $lang->weekly->builtInCategoryList['week'] = 'Weekly Report'; $lang->weekly->builtInCategoryList['day'] = 'Daily Report'; -$lang->weekly->builtInCategoryList['milestone'] = 'Milestone'; +$lang->weekly->builtInCategoryList['milestone'] = 'Milestone Report'; $lang->weekly->reportHelpNotice = <<PV Planned Value diff --git a/module/weekly/lang/en.php b/module/weekly/lang/en.php index 969b0caff1..81033b0e3f 100644 --- a/module/weekly/lang/en.php +++ b/module/weekly/lang/en.php @@ -51,7 +51,7 @@ $lang->weekly->builtInScopes['rnd']['project'] = 'Project'; $lang->weekly->builtInCategoryList['month'] = 'Monthly Report'; $lang->weekly->builtInCategoryList['week'] = 'Weekly Report'; $lang->weekly->builtInCategoryList['day'] = 'Daily Report'; -$lang->weekly->builtInCategoryList['milestone'] = 'Milestone'; +$lang->weekly->builtInCategoryList['milestone'] = 'Milestone Report'; $lang->weekly->reportHelpNotice = <<PV Planned Value diff --git a/module/weekly/lang/fr.php b/module/weekly/lang/fr.php index 969b0caff1..81033b0e3f 100644 --- a/module/weekly/lang/fr.php +++ b/module/weekly/lang/fr.php @@ -51,7 +51,7 @@ $lang->weekly->builtInScopes['rnd']['project'] = 'Project'; $lang->weekly->builtInCategoryList['month'] = 'Monthly Report'; $lang->weekly->builtInCategoryList['week'] = 'Weekly Report'; $lang->weekly->builtInCategoryList['day'] = 'Daily Report'; -$lang->weekly->builtInCategoryList['milestone'] = 'Milestone'; +$lang->weekly->builtInCategoryList['milestone'] = 'Milestone Report'; $lang->weekly->reportHelpNotice = <<PV Planned Value diff --git a/module/weekly/lang/zh-cn.php b/module/weekly/lang/zh-cn.php index 0972b31c96..22326089ee 100644 --- a/module/weekly/lang/zh-cn.php +++ b/module/weekly/lang/zh-cn.php @@ -51,7 +51,7 @@ $lang->weekly->builtInScopes['rnd']['project'] = '项目'; $lang->weekly->builtInCategoryList['month'] = '月报'; $lang->weekly->builtInCategoryList['week'] = '周报'; $lang->weekly->builtInCategoryList['day'] = '日报'; -$lang->weekly->builtInCategoryList['milestone'] = '里程碑'; +$lang->weekly->builtInCategoryList['milestone'] = '里程碑报告'; $lang->weekly->reportHelpNotice = <<PV 计划完成的工作 From a4b370eb1c32886eeda3ecc208c561a5832be34a Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 30 Sep 2025 09:41:13 +0800 Subject: [PATCH 3/3] * [task#150365,done,0.5h] adjust icon block height. --- module/upgrade/ui/afterexec.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/upgrade/ui/afterexec.html.php b/module/upgrade/ui/afterexec.html.php index 1bf88956ed..025ca8ee66 100644 --- a/module/upgrade/ui/afterexec.html.php +++ b/module/upgrade/ui/afterexec.html.php @@ -89,7 +89,7 @@ div setClass('message flex-wrap justify-center' . ($hideHome ? ' hidden' : '')), cell ( - setClass('flex justify-center items-end h-48 mb-4'), + setClass('flex justify-center items-end h-36 mb-4'), icon ( setClass('text-success'),