Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix bug#360.

Browse Source
This commit is contained in:
chencongzhi520@gmail.com
2012-12-21 05:55:51 +00:00
parent 0c5b8888ad
commit df2f22fcd6
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/bug/control.php
View File

@@ -126,8 +126,9 @@ class bug extends control
$users = $this->user->getPairs('noletter');
/* Process the openedBuild and resolvedBuild fields. */
$builds = $this->loadModel('build')->getProductBuildPairs($productID);
foreach($bugs as $key => $bug)
foreach($bugs as $bug) $productIdList[] = $bug->product;
$builds = $this->loadModel('build')->getProductBuildPairs($productIdList);
foreach($bugs as $key => $bug)
{
$openBuildIdList = explode(',', $bug->openedBuild);
$openedBuild = '';

6
module/build/model.php
View File

@@ -85,19 +85,19 @@ class buildModel extends model
/**
* Get builds of a product in pairs.
*
* @param int $productID
* @param mix $products int|array
* @param string $params noempty|notrunk, can be a set of them
* @access public
* @return string
*/
public function getProductBuildPairs($productID, $params = '')
public function getProductBuildPairs($products, $params = '')
{
$sysBuilds = array();
if(strpos($params, 'noempty') === false) $sysBuilds = array('' => '');
if(strpos($params, 'notrunk') === false) $sysBuilds = $sysBuilds + array('trunk' => 'Trunk');
$builds = $this->dao->select('id,name')->from(TABLE_BUILD)
->where('product')->eq((int)$productID)
->where('product')->eq($products)
->andWhere('deleted')->eq(0)
->orderBy('date desc, id desc')->fetchPairs();
if(!$builds) return $sysBuilds;