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/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(); 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);
- session->currentProductType != 'normal'):?> + session->currentProductType != 'normal' and isset($products[$productID])):?>
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) { 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}