diff --git a/module/project/model.php b/module/project/model.php index 23fa69b0c2..8fc4dea38d 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1921,6 +1921,7 @@ class projectModel extends model * @param string $end * @param string $type * @param string|int $interval + * @param string $format * @access public * @return array */ diff --git a/module/task/model.php b/module/task/model.php index 3775ca9086..81899870e6 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1245,15 +1245,6 @@ class taskModel extends model ->where('t1.project')->eq((int)$projectID) ->andWhere('t1.parent')->in($taskList) ->andWhere('t1.deleted')->eq(0) - ->beginIF($productID)->andWhere('t2.product')->eq((int)$productID)->fi() - ->beginIF($type == 'undone')->andWhere("(t1.status = 'wait' or t1.status ='doing')")->fi() - ->beginIF($type == 'needconfirm')->andWhere('t2.version > t1.storyVersion')->andWhere("t2.status = 'active'")->fi() - ->beginIF($type == 'assignedtome')->andWhere('t1.assignedTo')->eq($this->app->user->account)->fi() - ->beginIF($type == 'finishedbyme')->andWhere('t1.finishedby')->eq($this->app->user->account)->fi() - ->beginIF($type == 'delayed')->andWhere('t1.deadline')->gt('1970-1-1')->andWhere('t1.deadline')->lt(date(DT_DATE1))->andWhere('t1.status')->in('wait,doing')->fi() - ->beginIF(is_array($type) or strpos(',all,undone,needconfirm,assignedtome,delayed,finishedbyme,myinvolved,', ",$type,") === false)->andWhere('t1.status')->in($type)->fi() - ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi() - ->orderBy('t1.`id`,' . $orderBy) ->fetchAll('id'); if(!empty($children))