Merge branch 'master' of github.com:easysoft/zentaopms

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;

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();
 

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>

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)
         {

module/tree/css/edit.css

@@ -1 +0,0 @@
-body{background:white; overflow:none}