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

* Code for task#814.

Browse Source
This commit is contained in:
chencongzhi520@gmail.com
2012-06-14 02:58:19 +00:00
parent 55a8e375c6
commit 15b1ef2f5d
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+8 -2
View File
@@ -176,12 +176,15 @@ class testtaskModel extends model
* @access public
* @return array
*/
public function getRuns($taskID, $moduleID, $pager = null)
public function getRuns($taskID, $moduleID, $orderBy, $pager = null)
{
$orderBy = strpos($orderBy, 'assignedTo') !== false ? ('t1.' . $orderBy) : ('t2.' . $orderBy);
return $this->dao->select('t2.*,t1.*')->from(TABLE_TESTRUN)->alias('t1')
->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
->where('t1.task')->eq((int)$taskID)
->beginIF($moduleID)->andWhere('t2.module')->in($moduleID)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('', false);
}
@@ -195,12 +198,15 @@ class testtaskModel extends model
* @access public
* @return array
*/
public function getUserRuns($taskID, $user, $pager = null)
public function getUserRuns($taskID, $user, $orderBy, $pager = null)
{
$orderBy = strpos($orderBy, 'assignedTo') !== false ? ('t1.' . $orderBy) : ('t2.' . $orderBy);
return $this->dao->select('t2.*,t1.*')->from(TABLE_TESTRUN)->alias('t1')
->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
->where('t1.task')->eq((int)$taskID)
->andWhere('t1.assignedTo')->eq($user)
->orderBy($orderBy)
->page($pager)
->fetchAll();
}