From d121e2e01aa1e3fc3a58cfac294dbe5a755b956d Mon Sep 17 00:00:00 2001 From: liyuchun Date: Fri, 10 Dec 2021 10:11:56 +0800 Subject: [PATCH] * Fix bug #17293. --- module/mr/control.php | 1 - module/mr/lang/en.php | 1 + module/mr/lang/zh-cn.php | 1 + module/mr/view/link.html.php | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/mr/control.php b/module/mr/control.php index b8eb5917c6..d5b0bbb58d 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -455,7 +455,6 @@ class mr extends control $this->view->modulePairs = $this->loadModel('tree')->getOptionMenu($product->id, 'story'); $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->stories = $stories; - $this->view->summary = $this->loadModel('product')->summary($stories); $this->view->bugs = $bugs; $this->view->tasks = $tasks; $this->view->product = $product; diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index d71aafc341..46b72b57eb 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -95,6 +95,7 @@ $lang->mr->notFound = "Merge Request does not exist!"; $lang->mr->toCreatedMessage = "The merge request you submitted:%s, the build task succeeded."; $lang->mr->toReviewerMessage = "You have one merge request %s waiting."; $lang->mr->failMessage = "Your merge request %s failed. Please check its execution result. "; +$lang->mr->storySummary = "Total %s {$lang->SRCommon} on this page."; $lang->mr->apiError = new stdclass; $lang->mr->apiError->createMR = "Failed to create a merge request through API. Reason: %s"; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index 7a29b5c406..6a1acc8962 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -95,6 +95,7 @@ $lang->mr->notFound = "此{$lang->mr->common}不存在。"; $lang->mr->toCreatedMessage = "您提交的合并请求:%s 构建任务执行通过。"; $lang->mr->toReviewerMessage = "有一个合并请求:%s 待审核。"; $lang->mr->failMessage = "您提交的合并请求:%s 构建任务执行失败,查看执行结果。"; +$lang->mr->storySummary = "本页共 %s 个" . $lang->SRCommon; $lang->mr->apiError = new stdclass; $lang->mr->apiError->createMR = "通过API创建合并请求失败,失败原因:%s"; diff --git a/module/mr/view/link.html.php b/module/mr/view/link.html.php index 8545591db2..c262074e44 100644 --- a/module/mr/view/link.html.php +++ b/module/mr/view/link.html.php @@ -129,7 +129,7 @@