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

* adjust the builds search logic and the ajax api.

Browse Source
This commit is contained in:
wangchunsheng
2010-03-03 02:24:36 +00:00
parent ad55ec9bee
commit f688265145
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
trunk/module/build/control.php
View File

@@ -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'));
}
}

18
trunk/module/build/model.php
View File

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