Merge branch 'sprint/173_xieqiyu_16479' into 'sprint/170'

* Fix bug#16479.

See merge request easycorp/zentaopms!564

module/bug/model.php

@@ -1313,7 +1313,7 @@ class bugModel extends model
         $this->config->bug->search['params']['module']['values']        = $modules;
         $this->config->bug->search['params']['execution']['values']     = $this->loadModel('product')->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
         $this->config->bug->search['params']['severity']['values']      = array(0 => '') + $this->lang->bug->severityList; //Fix bug #939.
-        $this->config->bug->search['params']['openedBuild']['values']   = $this->loadModel('build')->getProductBuildPairs($productID, 0, 'withbranch');
+        $this->config->bug->search['params']['openedBuild']['values']   = $this->loadModel('build')->getProductBuildPairs($productID, 'all', 'withbranch');
         $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
         if($this->session->currentProductType == 'normal')
         {

module/productplan/model.php

@@ -191,21 +191,6 @@ class productplanModel extends model
             ->orderBy('t1.begin desc')
             ->fetchAll('id');
 
-        if($expired == 'unexpired')
-        {
-            $plans += $this->dao->select('t1.id,t1.title,t1.parent,t1.begin,t1.end,t2.name as branchName')->from(TABLE_PRODUCTPLAN)->alias('t1')
-                ->leftJoin(TABLE_BRANCH)->alias('t2')->on('t2.id=t1.branch')
-                ->where('t1.product')->in($product)
-                ->andWhere('t1.deleted')->eq(0)
-                ->andWhere('t1.end')->lt($date)
-                ->beginIF($branch)->andWhere("t1.branch")->in("0,$branch")->fi()
-                ->beginIF($plans)->andWhere("t1.id")->notIN(array_keys($plans))->fi()
-                ->beginIF($skipParent)->andWhere('t1.parent')->ne(-1)->fi()
-                ->orderBy('t1.begin desc')
-                ->limit(5)
-                ->fetchAll('id');
-        }
-
         $plans       = $this->reorder4Children($plans);
         $planPairs   = array();
         $parentTitle = array();

module/testcase/control.php

@@ -940,18 +940,7 @@ class testcase extends control
                 if($product->type != 'normal')
                 {
                     $branches = $this->loadModel('branch')->getPairs($productID);
-                    if($branch === 'all')
-                    {
-                        $modules[0] = $this->tree->getOptionMenu($productID, $viewType = 'case', 0, 0);
-                        foreach($branches as $branchID => $branchName)
-                        {
-                            $modules[$branchID] = $this->tree->getOptionMenu($productID, $viewType = 'case', 0, $branchID);
-                        }
-                    }
-                    else
-                    {
-                        $modules[$branch] = $this->tree->getOptionMenu($productID, $viewType = 'case', 0, $branch);
-                    }
+                    foreach($branches as $branchID => $branchName) $modules[$branchID] = $this->tree->getOptionMenu($productID, $viewType = 'case', 0, $branchID);
                 }
                 else
                 {

module/testtask/view/cases.html.php

@@ -84,7 +84,7 @@
         <div class='table-actions btn-toolbar'>
           <div class='btn-group dropup'>
             <?php
-            $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID");
+            $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID&branch=$task->branch");
             $misc       = $canBatchEdit ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
             echo html::commonButton($lang->edit, $misc);
             ?>