* finish task #1941.

2014-07-18 06:45:07 +00:00
parent edc2ea74d7
commit 9d29148250
6 changed files with 27 additions and 21 deletions
@@ -63,7 +63,7 @@ class testtaskModel extends model
     * @access public
     * @return array
     */
-    public function getProductTasks($productID, $orderBy = 'id_desc', $pager = null)
+    public function getProductTasks($productID, $orderBy = 'id_desc', $pager = null, $type = '')
    {
        return $this->dao->select('t1.*, t2.name AS productName, t3.name AS projectName, t4.name AS buildName')
            ->from(TABLE_TESTTASK)->alias('t1')
@@ -72,6 +72,8 @@ class testtaskModel extends model
            ->leftJoin(TABLE_BUILD)->alias('t4')->on('t1.build = t4.id')
            ->where('t1.product')->eq((int)$productID)
            ->andWhere('t1.deleted')->eq(0)
+            ->beginIF($type == 'wait')->andWhere('t1.status')->ne('done')->fi()
+            ->beginIF($type == 'done')->andWhere('t1.status')->eq('done')->fi()
            ->orderBy($orderBy)
            ->page($pager)
            ->fetchAll();