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

* Rename project to execution.

Browse Source
This commit is contained in:
holan20180123
2020-11-19 15:22:58 +08:00
parent 2912170c06
commit 7c8ec20264
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/doc/control.php
View File

@@ -60,7 +60,7 @@ class doc extends control
$this->view->myDocs = $this->doc->getDocsByBrowseType(0, 'openedbyme', 0, 0, 'addedDate_desc', $pager); $this->view->myDocs = $this->doc->getDocsByBrowseType(0, 'openedbyme', 0, 0, 'addedDate_desc', $pager);
$this->view->statisticInfo = $this->doc->getStatisticInfo(); $this->view->statisticInfo = $this->doc->getStatisticInfo();
$this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->doingProjects = $this->loadModel('project')->getProjectsByProgram($this->session->PRJ, 'undone', 5); $this->view->doingProjects = $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'undone', 5);
$this->display(); $this->display();
} }

6
module/doc/model.php
View File

@@ -767,7 +767,7 @@ class docModel extends model
$this->config->doc->search['actionURL'] = $actionURL; $this->config->doc->search['actionURL'] = $actionURL;
$this->config->doc->search['queryID'] = $queryID; $this->config->doc->search['queryID'] = $queryID;
$this->config->doc->search['params']['product']['values'] = array(''=>'') + $this->loadModel('product')->getPairs('nocode', $this->session->PRJ) + array('all'=>$this->lang->doc->allProduct); $this->config->doc->search['params']['product']['values'] = array(''=>'') + $this->loadModel('product')->getPairs('nocode', $this->session->PRJ) + array('all'=>$this->lang->doc->allProduct);
$this->config->doc->search['params']['project']['values'] = array(''=>'') + $this->loadModel('project')->getPairs('nocode', $this->session->PRJ) + array('all'=>$this->lang->doc->allProject); $this->config->doc->search['params']['project']['values'] = array(''=>'') + $this->loadModel('project')->getExecutionPairs($this->session->PRJ, 'all', 'nocode') + array('all'=>$this->lang->doc->allProject);
$this->config->doc->search['params']['lib']['values'] = array(''=>'', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all); $this->config->doc->search['params']['lib']['values'] = array(''=>'', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all);
/* Get the modules. */ /* Get the modules. */
@@ -1108,7 +1108,7 @@ class docModel extends model
$idList = array(); $idList = array();
$projectID = $this->session->PRJ; $projectID = $this->session->PRJ;
if($type == 'product') $idList = $this->loadModel('product')->getProductIDByProject($projectID, false); if($type == 'product') $idList = $this->loadModel('product')->getProductIDByProject($projectID, false);
if($type == 'project') $idList = $this->loadModel('project')->getProjectIDByProgram($projectID); if($type == 'project') $idList = $this->loadModel('project')->getExecutionsByProject($projectID);
$table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT; $table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
$stmt = $this->dao->select('t1.*')->from(TABLE_DOCLIB)->alias('t1') $stmt = $this->dao->select('t1.*')->from(TABLE_DOCLIB)->alias('t1')
@@ -1480,7 +1480,7 @@ class docModel extends model
public function getLibIdListByProject($projectID = 0) public function getLibIdListByProject($projectID = 0)
{ {
$products = $this->loadModel('product')->getProductIDByProject($projectID, false); $products = $this->loadModel('product')->getProductIDByProject($projectID, false);
$projects = $this->loadModel('project')->getProjectIDByProgram($projectID); $projects = $this->loadModel('project')->getExecutionsByProject($projectID);
$projectLibs = array(); $projectLibs = array();
$productLibs = array(); $productLibs = array();