From bc7855e7e39dd1a3ddbc3d95dc2d21e1d9ca4ace Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 14 Mar 2023 13:50:17 +0800 Subject: [PATCH 1/5] * Add skip stash page. --- module/doc/view/createlib.html.php | 2 +- module/my/view/preference.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php index a211656c57..8dcc0847a5 100644 --- a/module/doc/view/createlib.html.php +++ b/module/doc/view/createlib.html.php @@ -19,7 +19,7 @@

doc->createLib;?>

-
+ diff --git a/module/my/view/preference.html.php b/module/my/view/preference.html.php index 75aa447338..d1dd4445d0 100755 --- a/module/my/view/preference.html.php +++ b/module/my/view/preference.html.php @@ -19,7 +19,7 @@

my->preference;?>

- +
doc->libType?>
From 2d35e8f3c01c7a8546cb99bba871c6a77d29bf4b Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 14 Mar 2023 14:32:50 +0800 Subject: [PATCH 2/5] * Modify language for lite menu. --- extension/lite/common/ext/lang/de/lite.php | 4 ++-- extension/lite/common/ext/lang/en/lite.php | 4 ++-- extension/lite/common/ext/lang/fr/lite.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extension/lite/common/ext/lang/de/lite.php b/extension/lite/common/ext/lang/de/lite.php index 5aaca40bd0..ebfaa28240 100644 --- a/extension/lite/common/ext/lang/de/lite.php +++ b/extension/lite/common/ext/lang/de/lite.php @@ -30,7 +30,7 @@ if($config->edition != 'open') /* Menu order. */ $lang->mainNav->menuOrder = array(); $lang->mainNav->menuOrder[5] = 'my'; -$lang->mainNav->menuOrder[10] = $lang->projectCommon; +$lang->mainNav->menuOrder[10] = 'project'; $lang->mainNav->menuOrder[15] = 'kanban'; $lang->mainNav->menuOrder[35] = 'doc'; $lang->mainNav->menuOrder[45] = 'system'; @@ -137,7 +137,7 @@ $lang->doc->menuOrder[5] = 'dashboard'; $lang->doc->menuOrder[10] = 'recent'; $lang->doc->menuOrder[15] = 'my'; $lang->doc->menuOrder[20] = 'collect'; -$lang->doc->menuOrder[25] = $lang->projectCommon; +$lang->doc->menuOrder[25] = 'product'; $lang->doc->menuOrder[30] = 'custom'; $lang->doc->menu->project['subMenu'] = new stdclass(); diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php index 5aaca40bd0..6d0fdfcc56 100644 --- a/extension/lite/common/ext/lang/en/lite.php +++ b/extension/lite/common/ext/lang/en/lite.php @@ -30,7 +30,7 @@ if($config->edition != 'open') /* Menu order. */ $lang->mainNav->menuOrder = array(); $lang->mainNav->menuOrder[5] = 'my'; -$lang->mainNav->menuOrder[10] = $lang->projectCommon; +$lang->mainNav->menuOrder[10] = 'project'; $lang->mainNav->menuOrder[15] = 'kanban'; $lang->mainNav->menuOrder[35] = 'doc'; $lang->mainNav->menuOrder[45] = 'system'; @@ -137,7 +137,7 @@ $lang->doc->menuOrder[5] = 'dashboard'; $lang->doc->menuOrder[10] = 'recent'; $lang->doc->menuOrder[15] = 'my'; $lang->doc->menuOrder[20] = 'collect'; -$lang->doc->menuOrder[25] = $lang->projectCommon; +$lang->doc->menuOrder[25] = 'project'; $lang->doc->menuOrder[30] = 'custom'; $lang->doc->menu->project['subMenu'] = new stdclass(); diff --git a/extension/lite/common/ext/lang/fr/lite.php b/extension/lite/common/ext/lang/fr/lite.php index 5aaca40bd0..6d0fdfcc56 100644 --- a/extension/lite/common/ext/lang/fr/lite.php +++ b/extension/lite/common/ext/lang/fr/lite.php @@ -30,7 +30,7 @@ if($config->edition != 'open') /* Menu order. */ $lang->mainNav->menuOrder = array(); $lang->mainNav->menuOrder[5] = 'my'; -$lang->mainNav->menuOrder[10] = $lang->projectCommon; +$lang->mainNav->menuOrder[10] = 'project'; $lang->mainNav->menuOrder[15] = 'kanban'; $lang->mainNav->menuOrder[35] = 'doc'; $lang->mainNav->menuOrder[45] = 'system'; @@ -137,7 +137,7 @@ $lang->doc->menuOrder[5] = 'dashboard'; $lang->doc->menuOrder[10] = 'recent'; $lang->doc->menuOrder[15] = 'my'; $lang->doc->menuOrder[20] = 'collect'; -$lang->doc->menuOrder[25] = $lang->projectCommon; +$lang->doc->menuOrder[25] = 'project'; $lang->doc->menuOrder[30] = 'custom'; $lang->doc->menu->project['subMenu'] = new stdclass(); From 3a06344d5592f06cef4691ba2bc4020e082beee2 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 14 Mar 2023 15:03:50 +0800 Subject: [PATCH 3/5] * Modify program language. --- module/product/lang/zh-cn.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index d5edd03248..0bc3f98def 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -93,12 +93,12 @@ $lang->product->unfoldClosed = '展开已关闭'; $lang->product->confirmDelete = " 您确定删除该{$lang->productCommon}吗？"; $lang->product->errorNoProduct = "还没有创建{$lang->productCommon}！"; $lang->product->accessDenied = "您无权访问该{$lang->productCommon}"; -$lang->product->programChangeTip = "如下{$lang->projectCommon}只关联了该{$lang->productCommon}， 将直接转移至新{$lang->projectCommon}集下。"; +$lang->product->programChangeTip = "如下{$lang->projectCommon}只关联了该{$lang->productCommon}， 将直接转移至新项目集下。"; $lang->product->notChangeProgramTip = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到如下{$lang->projectCommon}，请点击{$lang->projectCommon}名称进入{$lang->SRCommon}列表取消关联后再操作"; -$lang->product->confirmChangeProgram = "如下{$lang->projectCommon}既关联了该{$lang->productCommon}又关联了其他{$lang->productCommon}，请确认是否继续关联该{$lang->productCommon}，勾选后将取消与其他{$lang->productCommon}的关联关系，同时转移至新{$lang->projectCommon}集下。"; +$lang->product->confirmChangeProgram = "如下{$lang->projectCommon}既关联了该{$lang->productCommon}又关联了其他{$lang->productCommon}，请确认是否继续关联该{$lang->productCommon}，勾选后将取消与其他{$lang->productCommon}的关联关系，同时转移至新项目集下。"; $lang->product->changeProgramError = "该{$lang->productCommon}的{$lang->SRCommon}已经关联到{$lang->projectCommon}，请取消关联后再操作"; -$lang->product->changeLineError = "{$lang->productCommon}线下已有{$lang->productCommon}，不可修改所属{$lang->projectCommon}集。"; -$lang->product->programEmpty = '{$lang->projectCommon}集不能为空'; +$lang->product->changeLineError = "{$lang->productCommon}线下已有{$lang->productCommon}，不可修改所属项目集。"; +$lang->product->programEmpty = '项目集不能为空'; $lang->product->nameIsDuplicate = "『%s』{$lang->productCommon}线已经存在，请重新设置！"; $lang->product->nameIsDuplicated = "{$lang->productCommon}线已经有『%s』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。"; $lang->product->reviewStory = '您不是研发需求 "%s" 的评审人，无法评审，本次操作已被过滤。'; From 8580b1362787a90457749b2df5e56e88c1bfcc8e Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 14 Mar 2023 15:05:42 +0800 Subject: [PATCH 4/5] * Fix bug 32911. --- module/programplan/lang/de.php | 2 +- module/programplan/lang/en.php | 2 +- module/programplan/lang/fr.php | 2 +- module/programplan/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php index 6cbe6a9661..c32a2fa539 100644 --- a/module/programplan/lang/de.php +++ b/module/programplan/lang/de.php @@ -73,7 +73,7 @@ $lang->programplan->emptyBegin = '『Begin』should not be blank'; $lang->programplan->emptyEnd = '『End』should not be blank'; $lang->programplan->checkBegin = '『Begin』should be valid date'; $lang->programplan->checkEnd = '『End』should be valid date'; -$lang->programplan->methodTip = "You can choose to continue creating stages or Iterations/Kanban for work in this stage. It's not supported to further split the Iteration/Kanban."; +$lang->programplan->methodTip = "You can choose to continue creating stages or {$lang->executionCommon}/Kanban for work in this stage. It's not supported to further split the {$lang->executionCommon}/Kanban."; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php index de3a827009..b1869ba59a 100644 --- a/module/programplan/lang/en.php +++ b/module/programplan/lang/en.php @@ -73,7 +73,7 @@ $lang->programplan->emptyBegin = '『Begin』should not be blank'; $lang->programplan->emptyEnd = '『End』should not be blank'; $lang->programplan->checkBegin = '『Begin』should be valid date'; $lang->programplan->checkEnd = '『End』should be valid date'; -$lang->programplan->methodTip = "You can choose to continue creating stages or Iterations/Kanban for work in this stage. It's not supported to further split the Iteration/Kanban."; +$lang->programplan->methodTip = "You can choose to continue creating stages or {$lang->executionCommon}/Kanban for work in this stage. It's not supported to further split the {$lang->executionCommon}/Kanban."; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php index 6cbe6a9661..c32a2fa539 100644 --- a/module/programplan/lang/fr.php +++ b/module/programplan/lang/fr.php @@ -73,7 +73,7 @@ $lang->programplan->emptyBegin = '『Begin』should not be blank'; $lang->programplan->emptyEnd = '『End』should not be blank'; $lang->programplan->checkBegin = '『Begin』should be valid date'; $lang->programplan->checkEnd = '『End』should be valid date'; -$lang->programplan->methodTip = "You can choose to continue creating stages or Iterations/Kanban for work in this stage. It's not supported to further split the Iteration/Kanban."; +$lang->programplan->methodTip = "You can choose to continue creating stages or {$lang->executionCommon}/Kanban for work in this stage. It's not supported to further split the {$lang->executionCommon}/Kanban."; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php index d4d472e133..f4703a9ceb 100644 --- a/module/programplan/lang/zh-cn.php +++ b/module/programplan/lang/zh-cn.php @@ -73,7 +73,7 @@ $lang->programplan->emptyBegin = '『计划开始』日期不能为空'; $lang->programplan->emptyEnd = '『计划完成』日期不能为空'; $lang->programplan->checkBegin = '『计划开始』应当为合法的日期'; $lang->programplan->checkEnd = '『计划完成』应当为合法的日期'; -$lang->programplan->methodTip = '您可以在该阶段下选择继续创建阶段或创建迭代/看板进行工作。迭代/看板不支持继续拆分。'; +$lang->programplan->methodTip = "您可以在该阶段下选择继续创建阶段或创建{$lang->executionCommon}/看板进行工作。{$lang->executionCommon}/看板不支持继续拆分。"; $lang->programplan->milestoneList[1] = '是'; $lang->programplan->milestoneList[0] = '否'; From 2b7cff9090f5f715a05d368d95a3632ddff39c95 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 15 Mar 2023 09:22:49 +0800 Subject: [PATCH 5/5] * Fixed list title color issues. --- module/program/view/browsebylist.html.php | 2 +- module/project/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 46a69e5651..01a87def82 100755 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -61,7 +61,7 @@   user->admin or strpos(",{$app->user->view->programs},", ",$program->id,") !== false) ? html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name) : $program->name;?> - createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name, '', "class='text-ellipsis text-primary' title='{$program->name}'");?> + createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name, '', "class='text-ellipsis' title='{$program->name}'");?> status != 'done' and $program->status != 'closed' and $program->status != 'suspended') { diff --git a/module/project/model.php b/module/project/model.php index 51e18c40ec..de867f33be 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2303,7 +2303,7 @@ class projectModel extends model if(!empty($suffix) or !empty($prefix)) echo '
'; if(!empty($prefix)) echo $prefix; if($this->config->vision == 'rnd') $projectIcon = " "; - echo html::a($projectLink, $projectIcon . $project->name, '', "class='text-ellipsis text-primary'"); + echo html::a($projectLink, $projectIcon . $project->name, '', "class='text-ellipsis'"); if(!empty($suffix)) echo $suffix; if(!empty($suffix) or !empty($prefix)) echo '
'; break;
my->storyConcept;?>