* Merge module project.

This commit is contained in:
tanghucheng
2023-11-16 01:47:34 -05:00
parent ce91849c29
commit 4fda3715ae
2 changed files with 7 additions and 5 deletions
+5 -1
View File
@@ -315,6 +315,8 @@ class project extends control
$browseType = strtolower($browseType);
if(!in_array($browseType, array('all', 'undone'))) unset($this->config->project->dtable->fieldList['status']);
$this->loadModel('program')->refreshStats(); // Refresh stats fields of projects.
/* Load pager. */
$this->app->loadClass('pager', true);
$pager = new pager($recTotal, $recPerPage, $pageID);
@@ -324,7 +326,7 @@ class project extends control
$this->project->buildSearchForm($queryID, $actionURL);
$programTitle = $this->loadModel('setting')->getItem("owner={$this->app->user->account}&module=project&key=programTitle");
$projectStats = $this->loadModel('program')->getProjectStats($programID, $browseType, $queryID, $orderBy, $programTitle, false, $pager);
$projectStats = $this->program->getProjectStats($programID, $browseType, $queryID, $orderBy, $programTitle, false, $pager);
$this->view->title = $this->lang->project->browse;
$this->view->projectStats = $this->projectZen->processProjectListData($projectStats);
@@ -750,6 +752,8 @@ class project extends control
$this->app->loadClass('pager', true);
$pager = new pager($recTotal, $recPerPage, $pageID);
$this->loadModel('program')->refreshStats(); // Refresh stats fields of projects.
$this->view->title = $this->lang->execution->allExecutions;
$this->view->executionStats = $this->execution->getStatData($projectID, $status, $productID, 0, (bool)$this->cookie->showTask, '', $orderBy, $pager);
$this->view->productList = array(0 => $this->lang->product->all) + $this->product->getProductPairsByProject($projectID, 'all', '', false);