diff --git a/trunk/module/build/control.php b/trunk/module/build/control.php index 8a87c4749e..6509bb4312 100644 --- a/trunk/module/build/control.php +++ b/trunk/module/build/control.php @@ -100,13 +100,15 @@ class build extends control /* AJAX接口:获得产品的build列表。*/ public function ajaxGetProductBuilds($productID, $varName, $build = '') { - die(html::select($varName, $this->build->getProductBuildPairs($productID), $build)); + if($varName == 'openedBuild') die(html::select($varName . '[]', $this->build->getProductBuildPairs($productID, 'noempty'), $build, 'size=4 class=select-3 multiple')); + if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProductBuildPairs($productID, 'noempty'), $build, 'class=select-3')); } /* AJAX接口:获得项目的build列表。*/ public function ajaxGetProjectBuilds($projectID, $varName, $build = '') { - die(html::select($varName, $this->build->getProjectBuildPairs($projectID), $build)); + if($varName == 'openedBuild') die(html::select($varName . '[]', $this->build->getProjectBuildPairs($projectID, 'noempty'), $build, 'size=4 class=select-3 multiple')); + if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProjectBuildPairs($projectID, 'noempty'), $build, 'class=select-3')); } } diff --git a/trunk/module/build/model.php b/trunk/module/build/model.php index 5a142e3440..72ea2fec4c 100644 --- a/trunk/module/build/model.php +++ b/trunk/module/build/model.php @@ -49,10 +49,13 @@ class buildModel extends model ->fetchAll(); } - /* 查找项目中的build key=>value对。*/ - public function getProjectBuildPairs($projectID) + /* 查找项目中的build列表。params='noempty|notrunk' */ + public function getProjectBuildPairs($projectID, $params = '') { - $sysBuilds = array('' => '', 'trunk' => 'Trunk'); + $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('project')->eq((int)$projectID)->orderBy('id desc')->fetchPairs(); if(!$builds) return $sysBuilds; $releases = $this->dao->select('build,name')->from(TABLE_RELEASE)->where('build')->in(array_keys($builds))->fetchPairs(); @@ -60,10 +63,13 @@ class buildModel extends model return $sysBuilds + $builds; } - /* 查找产品中的build列表。*/ - public function getProductBuildPairs($productID) + /* 查找产品中的build列表。params='noempty|notrunk' */ + public function getProductBuildPairs($productID, $params = '') { - $sysBuilds = array('' => '', 'trunk' => 'Trunk'); + $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)->orderBy('id desc')->fetchPairs(); if(!$builds) return $sysBuilds; $releases = $this->dao->select('build,name')->from(TABLE_RELEASE)->where('build')->in(array_keys($builds))->fetchPairs();