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

* finish the task #547.

Browse Source
This commit is contained in:
shiyangyangwork@yahoo.cn
2011-10-17 01:45:01 +00:00
parent a5fe7d91d0
commit b9f4ea623e
6 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/action/model.php
View File

@@ -258,7 +258,7 @@ class actionModel extends model
* @access public
* @return array
*/
public function getDynamic($account = 'all', $period = 'all', $orderBy = 'date_desc', $pager = null, $projectID = 0)
public function getDynamic($account = 'all', $period = 'all', $orderBy = 'date_desc', $pager = null, $productID = 'all', $projectID = 'all')
{
$period = $this->computeBeginAndEnd($period);
extract($period);
@@ -267,7 +267,8 @@ class actionModel extends model
->where('date')->gt($begin)
->andWhere('date')->lt($end)
->beginIF($account != 'all')->andWhere('actor')->eq($account)->fi()
->beginIF($projectID != 0)->andWhere('project')->eq($projectID)->fi()
->beginIF($productID != 'all')->andWhere('product')->eq($productID)->fi()
->beginIF($projectID != 'all')->andWhere('project')->eq($projectID)->fi()
->orderBy($orderBy)->page($pager)->fetchAll();
if(!$actions) return array();