From 5a6ea5fc094dc897b3d65c9fd263ebb80404b2c3 Mon Sep 17 00:00:00 2001 From: wangjianhua Date: Mon, 24 Oct 2022 12:28:46 +0800 Subject: [PATCH] * Fix bug #28553: not display project of shadow product. --- module/action/lang/de.php | 4 ++-- module/action/lang/en.php | 4 ++-- module/action/lang/fr.php | 4 ++-- module/action/lang/vi.php | 4 ++-- module/action/lang/zh-cn.php | 4 ++-- module/action/lang/zh-tw.php | 4 ++-- module/project/model.php | 4 ++-- module/repo/view/create.html.php | 1 + 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/module/action/lang/de.php b/module/action/lang/de.php index f9d0489931..5f97c2727e 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -393,8 +393,8 @@ $lang->action->label->updatetolib = 'updated'; $lang->action->label->ganttmove = 'sorted'; $lang->action->label->submitreview = 'submitted'; $lang->action->label->switchtolean = 'switch from new mode to lean mode'; -$lang->action->label->linkrepo = 'Linked Code Repo'; -$lang->action->label->unlinkrepo = 'Unlinked Code Repo'; +$lang->action->label->linkedrepo = 'Linked Code Repo'; +$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index d95d187fd9..0cd84e994d 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -393,8 +393,8 @@ $lang->action->label->updatetolib = 'updated'; $lang->action->label->ganttmove = 'sorted'; $lang->action->label->submitreview = 'submitted'; $lang->action->label->switchtolean = 'switch from new mode to lean mode'; -$lang->action->label->linkrepo = 'Linked Code Repo'; -$lang->action->label->unlinkrepo = 'Unlinked Code Repo'; +$lang->action->label->linkedrepo = 'Linked Code Repo'; +$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass; diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index 6b7c42fb78..bdde5acbc2 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -393,8 +393,8 @@ $lang->action->label->updatetolib = 'MàJ'; $lang->action->label->ganttmove = 'sorted'; $lang->action->label->submitreview = 'submitted'; $lang->action->label->switchtolean = 'switch from new mode to lean mode'; -$lang->action->label->linkrepo = 'Linked Code Repo'; -$lang->action->label->unlinkrepo = 'Unlinked Code Repo'; +$lang->action->label->linkedrepo = 'Linked Code Repo'; +$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass(); diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php index c1ec8f586d..f9e5281266 100644 --- a/module/action/lang/vi.php +++ b/module/action/lang/vi.php @@ -306,8 +306,8 @@ $lang->action->label->syncproject = 'start'; $lang->action->label->syncexecution = 'start'; $lang->action->label->startProgram = '(The start of the project sets the status of the program as Ongoing)'; $lang->action->label->submitreview = 'submitted'; -$lang->action->label->linkrepo = 'Linked Code Repo'; -$lang->action->label->unlinkrepo = 'Unlinked Code Repo'; +$lang->action->label->linkedrepo = 'Linked Code Repo'; +$lang->action->label->unlinkedrepo = 'Unlinked Code Repo'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index cb09fda2c1..0408f04a23 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -393,8 +393,8 @@ $lang->action->label->updatetolib = '更新了'; $lang->action->label->ganttmove = '排序了'; $lang->action->label->submitreview = '提交了评审'; $lang->action->label->switchtolean = '从综合模式切换为迅捷模式'; -$lang->action->label->linkrepo = '关联了代码库'; -$lang->action->label->unlinkrepo = '取消关联代码库'; +$lang->action->label->linkedrepo = '关联代码库到'; +$lang->action->label->unlinkedrepo = '取消了项目与代码库的关联'; /* 动态信息按照对象分组 */ $lang->action->dynamicAction = new stdclass(); diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index a69448d150..420b1e29e5 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -324,8 +324,8 @@ $lang->action->label->importfromgitlab = '從Gitlab關聯創建了'; $lang->action->label->archived = '歸檔了'; $lang->action->label->restore = '還原了'; $lang->action->label->mergedbranch = '合併分支'; -$lang->action->label->linkrepo = '關聯了代碼庫'; -$lang->action->label->unlinkrepo = '取消關聯了代碼庫'; +$lang->action->label->linkedrepo = '關聯代碼庫到'; +$lang->action->label->unlinkedrepo = '取消了項目与代碼庫的關聯'; /* 動態信息按照對象分組 */ $lang->action->dynamicAction = new stdclass(); diff --git a/module/project/model.php b/module/project/model.php index 7b4572341f..1518f6563a 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2998,7 +2998,7 @@ class projectModel extends model ->where('id')->eq($repo->id)->exec(); /* Save action log. */ - $this->action->create('project', $projectID, 'unlinkRepo', $repo->name); + $this->action->create('project', $projectID, 'unlinkedRepo', $repo->name); } /* 2. Add new relations. */ @@ -3022,7 +3022,7 @@ class projectModel extends model ->set('projects')->eq(implode(',', $newProjects)) ->where('id')->eq($repo->id)->exec(); - $this->action->create('project', $projectID, 'linkRepo', $repo->name); + $this->action->create('project', $projectID, 'linkedRepo', $repo->name); } } diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php index 9c7a11aa26..7d9a5ae4af 100644 --- a/module/repo/view/create.html.php +++ b/module/repo/view/create.html.php @@ -25,6 +25,7 @@ app->tab =='project' and $shadowProduct):?> id);?> +
repo->product;?>