From ee98b305f2131c829287d4dd38a48249e71381d2 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Tue, 21 Dec 2021 16:01:06 +0800
Subject: [PATCH] * Finish task #46098.

---
 module/release/control.php          | 1 +
 module/release/lang/en.php          | 1 +
 module/release/lang/zh-cn.php       | 1 +
 module/release/model.php            | 7 ++++++-
 module/release/view/create.html.php | 2 ++
 module/story/model.php              | 2 +-
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/module/release/control.php b/module/release/control.php
index c71f6907c1..702c8f053c 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -73,6 +73,7 @@ class release extends control
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $releaseID));
             if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadProductBuilds($productID)"));
+
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "releaseID=$releaseID")));
         }
 
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index 0ca02ff425..0e4c7114b0 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -24,6 +24,7 @@ $lang->release->batchUnlinkStory = "Batch Unlink Stories";
 $lang->release->batchUnlinkBug   = "Batch Unlink Bugs";
 
 $lang->release->confirmDelete      = "Do you want to delete this release?";
+$lang->release->confirmLink        = "Whether to link the stories completed in the version and the bugs solved to the release?";
 $lang->release->confirmUnlinkStory = "Do you want to remove this story?";
 $lang->release->confirmUnlinkBug   = "Do you want to remove this bug?";
 $lang->release->existBuild         = '『Build』『%s』existed. You could change『name』or choose a『build』.';
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index 75304b8ae9..aa724f53c2 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -24,6 +24,7 @@ $lang->release->batchUnlinkStory = "批量移除{$lang->SRCommon}";
 $lang->release->batchUnlinkBug   = "批量移除Bug";
 
 $lang->release->confirmDelete      = "您确认删除该发布吗？";
+$lang->release->confirmLink        = "是否将版本中完成的{$lang->SRCommon}和已解决的bug关联到发布下？";
 $lang->release->confirmUnlinkStory = "您确认移除该{$lang->SRCommon}吗？";
 $lang->release->confirmUnlinkBug   = "您确认移除该Bug吗？";
 $lang->release->existBuild         = '『版本』已经有『%s』这条记录了。您可以更改『发布名称』或者选择一个『版本』。';
diff --git a/module/release/model.php b/module/release/model.php
index e8c4dd0e5d..71719373b7 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -174,9 +174,14 @@ class releaseModel extends model
 
         if($release->build)
         {
-            $buildInfo = $this->dao->select('project, branch')->from(TABLE_BUILD)->where('id')->eq($release->build)->fetch();
+            $buildInfo = $this->dao->select('project, branch, stories, bugs')->from(TABLE_BUILD)->where('id')->eq($release->build)->fetch();
             $release->branch  = $buildInfo->branch;
             $release->project = $buildInfo->project;
+            if($release->sync)
+            {
+                $release->stories = $buildInfo->stories;
+                $release->bugs    = $buildInfo->bugs;
+            }
         }
 
         $release = $this->loadModel('file')->processImgURL($release, $this->config->release->editor->create['id'], $this->post->uid);
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index 16d91956ca..2e8bdc2203 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?php js::set('confirmLink', $lang->release->confirmLink);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -64,6 +65,7 @@
           <tr>
             <td colspan='3' class='text-center form-actions'>
               <?php echo html::submitButton();?>
+              <?php echo html::hidden('sync', 'false');?>
               <?php echo html::backButton();?>
             </td>
           </tr>
diff --git a/module/story/model.php b/module/story/model.php
index 7ab52c820b..fb315693e4 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -170,10 +170,10 @@ class storyModel extends model
     public function getRequierements($productID)
     {
         return $this->dao->select('id,title')->from(TABLE_STORY)
+           ->where('deleted')->eq(0)
            ->andWhere('product')->eq($productID)
            ->andWhere('type')->eq('requirement')
            ->andWhere('status')->notIN('draft,closed')
-           ->where('deleted')->eq(0)
            ->fetchPairs();
     }