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

* ajust the code

Browse Source
This commit is contained in:
chencongzhi520@gmail.com
2011-05-01 08:28:13 +00:00
parent 4d8d8a8744
commit 9b854fc8d1
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+21 -21
View File
@@ -135,8 +135,8 @@ class project extends control
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
$tasks=array();
if($browseType!="bysearch")
$tasks = array();
if($browseType != "bysearch")
{
$tasks = $this->loadModel('task')->getProjectTasks($projectID, $status, $orderBy, $pager);
}
@@ -160,6 +160,7 @@ class project extends control
if($this->session->taskQuery == false) $this->session->set('taskQuery', ' 1 = 1');
}
$taskQuery = str_replace("`project` = 'all'", '1', $this->session->taskQuery); // Search all project.
$this->session->set('taskReport', $this->session->taskQuery);
$tasks = $this->project->getSearchTasks($taskQuery, $pager, $orderBy);
}
@@ -203,25 +204,24 @@ class project extends control
$this->view->searchForm = $this->fetch('search', 'buildForm', $this->config->project->search);
/* Assign. */
$this->view->tasks = $tasks;
$this->view->tabID = 'task';
$this->view->pager = $pager->get();
$this->view->recTotal = $pager->recTotal;
$this->view->recPerPage = $pager->recPerPage;
$this->view->orderBy = $orderBy;
$this->view->browseType = $browseType;
$this->view->status = $status;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->param = $param;
$this->view->statusWait =$statusWait;
$this->view->statusDone =$statusDone;
$this->view->statusDoing =$statusDoing;
$this->view->statusCancel =$statusCancel;
$this->view->totalEstimate =$totalEstimate;
$this->view->totalConsumed =$totalConsumed;
$this->view->totalLeft =$totalLeft;
$this->view->tasks = $tasks;
$this->view->tabID = 'task';
$this->view->pager = $pager->get();
$this->view->recTotal = $pager->recTotal;
$this->view->recPerPage = $pager->recPerPage;
$this->view->orderBy = $orderBy;
$this->view->browseType = $browseType;
$this->view->status = $status;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->param = $param;
$this->view->projectID = $projectID;
$this->view->statusWait = $statusWait;
$this->view->statusDone = $statusDone;
$this->view->statusDoing = $statusDoing;
$this->view->statusCancel = $statusCancel;
$this->view->totalEstimate = $totalEstimate;
$this->view->totalConsumed = $totalConsumed;
$this->view->totalLeft = $totalLeft;
$this->display();
}