From f195aa9ab08dc34dc07a26b602468f2dc15736a4 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 20 Dec 2023 10:43:03 +0800 Subject: [PATCH] * Fix bug #35503. --- module/product/view/track.html.php | 2 +- module/story/lang/de.php | 1 + module/story/lang/en.php | 1 + module/story/lang/fr.php | 1 + module/story/lang/zh-cn.php | 1 + module/story/model.php | 2 +- 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/module/product/view/track.html.php b/module/product/view/track.html.php index 730fbabda0..dc128e9a87 100644 --- a/module/product/view/track.html.php +++ b/module/product/view/track.html.php @@ -58,7 +58,7 @@ $requirement):?> track;?> - story->noRequirement;?> + story->noRelatedRequirement;?> URAndSR):?> story->ignoreChangeStage = 'The status of %s is Draft or Closed. This operation has been filtered.'; $lang->story->cannotDeleteParent = "Can not delete parent {$lang->SRCommon}"; $lang->story->moveChildrenTips = "Its Child {$lang->SRCommon} will be moved to the selected {$lang->productCommon} when editing the linked {$lang->productCommon} of Parent {$lang->SRCommon}."; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index d7b4b3b9a1..4c5eb5db5e 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -323,6 +323,7 @@ $lang->story->mustChooseResult = 'Select Result'; $lang->story->mustChoosePreVersion = 'Select a version to revert to.'; $lang->story->noStory = 'No stories yet. '; $lang->story->noRequirement = 'No requirements yet. '; +$lang->story->noRelatedRequirement = "No related requirements."; $lang->story->ignoreChangeStage = 'The status of %s is Draft or Closed. This operation has been filtered.'; $lang->story->cannotDeleteParent = "Can not delete parent {$lang->SRCommon}"; $lang->story->moveChildrenTips = "Its Child {$lang->SRCommon} will be moved to the selected {$lang->productCommon} when editing the linked {$lang->productCommon} of Parent {$lang->SRCommon}."; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index d2b9d54896..e1ae900a4f 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -323,6 +323,7 @@ $lang->story->mustChooseResult = 'Sélect Résultat'; $lang->story->mustChoosePreVersion = 'Sélect une version pour revenir en arrière.'; $lang->story->noStory = "Aucune story pour l'instant. "; $lang->story->noRequirement = 'No Requirements'; +$lang->story->noRelatedRequirement = "No related requirements."; $lang->story->ignoreChangeStage = 'The status of %s is Draft or Closed. This operation has been filtered.'; $lang->story->cannotDeleteParent = "Impossible de supprimer {$lang->SRCommon} parent"; $lang->story->moveChildrenTips = "Its Child {$lang->SRCommon} will be moved to the selected {$lang->productCommon} when editing the linked {$lang->productCommon} of Parent {$lang->SRCommon}."; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index b1c885eb67..2781259c9d 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -323,6 +323,7 @@ $lang->story->mustChooseResult = '必须选择评审意见'; $lang->story->mustChoosePreVersion = '必须选择回溯的版本'; $lang->story->noStory = "暂时没有{$lang->SRCommon}。"; $lang->story->noRequirement = "暂时没有{$lang->URCommon}。"; +$lang->story->noRelatedRequirement = "暂无相关{$lang->URCommon}。"; $lang->story->ignoreChangeStage = "{$lang->SRCommon} %s 状态为草稿或已关闭,本次操作已被过滤。"; $lang->story->cannotDeleteParent = "不能删除父{$lang->SRCommon}"; $lang->story->moveChildrenTips = "修改父{$lang->SRCommon}的所属{$lang->productCommon}会将其下的子{$lang->SRCommon}也移动到所选{$lang->productCommon}下。"; diff --git a/module/story/model.php b/module/story/model.php index ccff19fc56..16bf5d25b1 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -5644,7 +5644,7 @@ class storyModel extends model } } - $tracks['noRequirement'] = $stories; + if(!empty($stories)) $tracks['noRequirement'] = $stories; if($this->config->URAndSR) $pager->recTotal += 1; }