From d2cb9938b5c3b50d7c868af3e7bd37f8cca83bd0 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Mon, 12 Dec 2022 17:34:43 +0800
Subject: [PATCH] * Finish Task #79670

---
 module/execution/control.php         | 12 ++++++++++++
 module/execution/lang/de.php         |  3 +++
 module/execution/lang/en.php         |  3 +++
 module/execution/lang/fr.php         |  3 +++
 module/execution/lang/zh-cn.php      |  3 +++
 module/execution/view/story.html.php |  5 ++++-
 module/product/view/browse.html.php  |  6 +++++-
 module/project/lang/de.php           |  3 +++
 module/project/lang/en.php           |  3 +++
 module/project/lang/fr.php           |  3 +++
 module/project/lang/zh-cn.php        |  3 +++
 11 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 0e3a109c25..5379ec4ddb 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -934,6 +934,17 @@ class execution extends control
             $moduleTree = $this->tree->getProjectStoryTreeMenu($executionID, 0, array('treeModel', $createModuleLink));
         }
 
+        $executionProductList  = $this->loadModel('product')->getProducts($executionID);
+        $multiBranch = false;
+        foreach($executionProductList as $executionProduct)
+        {
+            if($executionProduct->type != 'normal')
+            {
+                $multiBranch = true;
+                break;
+            }
+        }
+
         /* Assign. */
         $this->view->title             = $title;
         $this->view->position          = $position;
@@ -963,6 +974,7 @@ class execution extends control
         $this->view->canBeChanged      = common::canModify('execution', $execution); // Determines whether an object is editable.
         $this->view->showBranch        = $showBranch;
         $this->view->storyStages       = $this->product->batchGetStoryStage($stories);
+        $this->view->multiBranch       = $multiBranch;
 
         $this->display();
     }
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index e325edbcdc..1aad7582a6 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -597,3 +597,6 @@ $lang->execution->gantt->exporting  = 'Exporting...';
 $lang->execution->gantt->exportFail = 'Failed to export.';
 
 $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#7FBB00', '#424BAC', '#66c5f8', '#EC2761');
+
+$lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported.";
+$lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated.";
\ No newline at end of file
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index d273799d4b..412c0c9f74 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -597,3 +597,6 @@ $lang->execution->gantt->exporting  = 'Exporting...';
 $lang->execution->gantt->exportFail = 'Failed to export.';
 
 $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#7FBB00', '#424BAC', '#66c5f8', '#EC2761');
+
+$lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported.";
+$lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated.";
\ No newline at end of file
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index a107beff48..4e87634ef9 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -597,3 +597,6 @@ $lang->execution->gantt->exporting  = 'Exporting...';
 $lang->execution->gantt->exportFail = 'Failed to export.';
 
 $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#7FBB00', '#424BAC', '#66c5f8', '#EC2761');
+
+$lang->execution->linkBranchStoryByPlanTips = "When a scheduled association requirement is executed, only the active requirements associated with the %s of this execution are imported.";
+$lang->execution->linkNormalStoryByPlanTips = "Only the active requirements are imported when the scheduled requirements are associated.";
\ No newline at end of file
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index decdee30da..2c93cb2e76 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -597,3 +597,6 @@ $lang->execution->gantt->exporting  = '正在导出……';
 $lang->execution->gantt->exportFail = '导出失败。';
 
 $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#7FBB00', '#424BAC', '#66c5f8', '#EC2761');
+
+$lang->execution->linkBranchStoryByPlanTips = "执行按计划关联需求时，只导入本执行所关联%s的激活状态的需求。";
+$lang->execution->linkNormalStoryByPlanTips = "执行按计划关联需求时，只导入激活状态的需求。";
\ No newline at end of file
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 6ca7343939..bb35137bae 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -402,7 +402,10 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
-        <?php $linkStoryByPlanTips = $execution->multiple ? $lang->execution->linkStoryByPlanTips : str_replace($lang->executionCommon, $lang->projectCommon, $lang->execution->linkStoryByPlanTips);?>
+        <?php
+        $linkStoryByPlanTips = $multiBranch ? sprintf($lang->execution->linkBranchStoryByPlanTips, $lang->project->branch) : $lang->execution->linkNormalStoryByPlanTips;
+        $linkStoryByPlanTips = $execution->multiple ? $linkStoryByPlanTips : str_replace($lang->executionCommon, $lang->projectCommon, $linkStoryByPlanTips);
+        ?>
         <h4 class="modal-title"><?php echo $lang->execution->linkStoryByPlan;?></h4><?php echo '(' . $linkStoryByPlanTips . ')';?>
       </div>
       <div class="modal-body">
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index dffefb71c9..f6440c871c 100755
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -620,7 +620,11 @@ js::set('vision',        $this->config->vision);
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
-        <h4 class="modal-title"><?php echo $lang->execution->linkStoryByPlan;?></h4><?php echo '(' . $lang->project->linkStoryByPlanTips . ')';?>
+        <h4 class="modal-title">
+          <?php
+          $linkStoryByPlanTips = $product->type == 'normal' ? $lang->project->linkNormalStoryByPlanTips : sprintf($lang->project->linkBranchStoryByPlanTips, $lang->product->branchName[$product->type]);
+          echo $lang->execution->linkStoryByPlan;?></h4><?php echo '(' . $linkStoryByPlanTips . ')';
+          ?>
       </div>
       <div class="modal-body">
         <div class='input-group'>
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 6436680178..9f10afb9ee 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -382,3 +382,6 @@ $lang->project->copyProject->nameTips           = '『Project Name』Cannot be r
 $lang->project->copyProject->codeTips           = '『Project Code』Cannot be repeated.';
 $lang->project->copyProject->endTips            = '『Schedule End』Cannot be empty.';
 $lang->project->copyProject->daysTips           = '『Available working days』Should be numerical.';
+
+$lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
+$lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
\ No newline at end of file
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 0aa80f04b9..291bff2889 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -382,3 +382,6 @@ $lang->project->copyProject->nameTips           = '『Project Name』Cannot be r
 $lang->project->copyProject->codeTips           = '『Project Code』Cannot be repeated.';
 $lang->project->copyProject->endTips            = '『Schedule End』Cannot be empty.';
 $lang->project->copyProject->daysTips           = '『Available working days』Should be numerical.';
+
+$lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
+$lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
\ No newline at end of file
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 0399d48ed2..55285fa342 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -382,3 +382,6 @@ $lang->project->copyProject->nameTips           = '『Project Name』Cannot be r
 $lang->project->copyProject->codeTips           = '『Project Code』Cannot be repeated.';
 $lang->project->copyProject->endTips            = '『Schedule End』Cannot be empty.';
 $lang->project->copyProject->daysTips           = '『Available working days』Should be numerical.';
+
+$lang->project->linkBranchStoryByPlanTips = "When the project is scheduled to associate requirements, only the activated requirements associated with the %s of the project are imported.";
+$lang->project->linkNormalStoryByPlanTips = "When the project plans to associate requirements, only the requirements that are active are imported.";
\ No newline at end of file
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index c0f24e413a..b7dfef7811 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -382,3 +382,6 @@ $lang->project->copyProject->nameTips           = '『项目名称』不可重
 $lang->project->copyProject->codeTips           = '『项目代号』不可重复需要修改。';
 $lang->project->copyProject->endTips            = '『计划完成』不能为空。';
 $lang->project->copyProject->daysTips           = '『可用工作日』应当是数字。';
+
+$lang->project->linkBranchStoryByPlanTips = "项目按计划关联需求时，只导入本项目所关联%s的激活状态的需求。";
+$lang->project->linkNormalStoryByPlanTips = "项目按计划关联需求时，只导入激活状态的需求。";