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

* adjust for project search.

Browse Source
This commit is contained in:
wangyidong
2013-03-15 02:04:36 +00:00
parent 3d035e4610
commit 3925f5b477
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/project/control.php
View File

@@ -171,14 +171,13 @@ class project extends control
if(strpos($this->session->taskQuery, "`project` =") === false) $this->session->set('taskQuery', $this->session->taskQuery . " AND `project` = $projectID");
if(strpos($this->session->taskQuery, "deleted =") === false) $this->session->set('taskQuery', $this->session->taskQuery . " AND deleted = '0'");
$projectIDs = array_keys($this->project->getPairs());
$projectQuery = "`project` in (" . implode($projectIDs, ',') . ")";
$projectQuery = "`project`" . helper::dbIN(array_keys($this->projects));
$taskQuery = str_replace("`project` = 'all'", $projectQuery, $this->session->taskQuery); // Search all project.
$taskQuery = $this->loadModel('search')->replaceDynamic($taskQuery);
$this->session->set('taskQueryCondition', $taskQuery);
$this->session->set('taskOnlyCondition', true);
$this->session->set('taskOrderBy', $orderBy);
$tasks = $this->project->getSearchTasks($taskQuery, $pager, $orderBy);
}