diff --git a/module/bug/config/table.php b/module/bug/config/table.php index 71e2e80571..856b198bd4 100644 --- a/module/bug/config/table.php +++ b/module/bug/config/table.php @@ -75,7 +75,7 @@ $config->bug->dtable->fieldList['plan']['width'] = 120; $config->bug->dtable->fieldList['plan']['group'] = 3; $config->bug->dtable->fieldList['plan']['sortType'] = true; $config->bug->dtable->fieldList['plan']['hint'] = true; -$config->bug->dtable->fieldList['plan']['dataSource'] = array('module' => 'productplan', 'method' =>'getPairs', 'params' => ['productIdList' => '$productID', 'branch' => '$branch']); +$config->bug->dtable->fieldList['plan']['dataSource'] = array('module' => 'productplan', 'method' =>'getPairs', 'params' => ['productIdList' => '$productIdList', 'branch' => '$branch']); $config->bug->dtable->fieldList['openedBuild']['title'] = $lang->bug->openedBuild; $config->bug->dtable->fieldList['openedBuild']['type'] = 'text'; diff --git a/module/bug/control.php b/module/bug/control.php index b883f78ab4..b1b4fb23bf 100755 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -646,7 +646,17 @@ class bug extends control { /* 设置bug导出的参数。 */ /* Set bug export params. */ - $this->session->set('bugTransferParams', array('productID' => $productID, 'executionID' => $executionID, 'branch' => 'all')); + if($executionID) + { + $productIdList = $this->loadModel('product')->getProductPairsByProject($executionID); + $productIdList = array_keys($productIdList); + } + else + { + $productIdList = array($productID); + } + + $this->session->set('bugTransferParams', array('productID' => $productID, 'executionID' => $executionID, 'branch' => 'all', 'productIdList' => $productIdList)); /* 设置导出数据源。 */ /* Set export data source. */