From b54f8762792c7f2d5f7fe50db9c134e479574f89 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 14 Oct 2019 10:57:45 +0800
Subject: [PATCH 1/4] * Finish task #6429.

---
 module/bug/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/bug/model.php b/module/bug/model.php
index 009e72fb0b..841acec8be 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -632,6 +632,7 @@ class bugModel extends model
             ->setIF($this->post->resolution  == '' and $this->post->resolvedDate =='', 'status', 'active')
             ->setIF($this->post->resolution  != '', 'confirmed', 1)
             ->setIF($this->post->story != false and $this->post->story != $oldBug->story, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story))
+            ->setIF(!$this->post->linkBug, 'linkBug', '')
             ->remove('comment,files,labels,uid,contactListMenu')
             ->get();
 

From 2f23d0ab1389a8862d2748f41d2e3b5c2c519592 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 14 Oct 2019 11:16:39 +0800
Subject: [PATCH 2/4] * Finish task #6417.

---
 module/tree/css/edit.css | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 module/tree/css/edit.css

diff --git a/module/tree/css/edit.css b/module/tree/css/edit.css
deleted file mode 100644
index 0037a851da..0000000000
--- a/module/tree/css/edit.css
+++ /dev/null
@@ -1 +0,0 @@
-body{background:white; overflow:none}

From 96983e4a009dce562fbe7e2301b9ad105cd47fea Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 14 Oct 2019 13:45:41 +0800
Subject: [PATCH 3/4] * Finish task #6436.

---
 module/testcase/control.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index c76877e043..c90a495de1 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -320,6 +320,7 @@ class testcase extends control
 
         /* Get the status of stories are not closed. */
         $storyStatus = $this->lang->story->statusList;
+        unset($storyStatus['closed']);
         $modules = array();
         if($currentModuleID)
         {

From 8286a068416caba6ce493eab55b61f972e2e8c3e Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 14 Oct 2019 14:04:42 +0800
Subject: [PATCH 4/4] * Finish task #6440.

---
 module/bug/control.php          | 2 +-
 module/bug/view/create.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 1b0b25fe03..5e22a3f736 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -408,7 +408,7 @@ class bug extends control
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
         $this->view->position[] = $this->lang->bug->create;
 
-        $this->view->products         =  $products;
+        $this->view->products         = $products;
         $this->view->productID        = $productID;
         $this->view->productName      = $this->products[$productID];
         $this->view->moduleOptionMenu = $moduleOptionMenu;
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index f6bab1886b..d57f1ebdcf 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -38,7 +38,7 @@ js::set('flow', $config->global->flow);
             <td class='w-600px'>
               <div class='input-group'>
                 <?php echo html::select('product', $products, $productID, "onchange='loadAll(this.value);' class='form-control chosen control-product'");?>
-                <?php if($this->session->currentProductType != 'normal'):?>
+                <?php if($this->session->currentProductType != 'normal' and isset($products[$productID])):?>
                 <?php  echo html::select('branch', $branches, $branch, "onchange='loadBranch()' class='form-control chosen control-branch'");?>
                 <?php endif;?>
               </div>