From 7c8ec20264337eb8fe543f07d8a889429c2ce3b1 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 19 Nov 2020 15:22:58 +0800
Subject: [PATCH] * Rename project to execution.

---
 module/doc/control.php | 2 +-
 module/doc/model.php   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index 8335a99a8d..32a22860e6 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -60,7 +60,7 @@ class doc extends control
         $this->view->myDocs           = $this->doc->getDocsByBrowseType(0, 'openedbyme', 0, 0, 'addedDate_desc', $pager);
         $this->view->statisticInfo    = $this->doc->getStatisticInfo();
         $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();
     }
diff --git a/module/doc/model.php b/module/doc/model.php
index 4b56147194..0ecd01735d 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -767,7 +767,7 @@ class docModel extends model
         $this->config->doc->search['actionURL'] = $actionURL;
         $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']['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);
 
         /* Get the modules. */
@@ -1108,7 +1108,7 @@ class docModel extends model
             $idList    = array();
             $projectID = $this->session->PRJ;
             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;
             $stmt  = $this->dao->select('t1.*')->from(TABLE_DOCLIB)->alias('t1')
@@ -1480,7 +1480,7 @@ class docModel extends model
     public function getLibIdListByProject($projectID = 0)
     {
         $products = $this->loadModel('product')->getProductIDByProject($projectID, false);
-        $projects = $this->loadModel('project')->getProjectIDByProgram($projectID);
+        $projects = $this->loadModel('project')->getExecutionsByProject($projectID);
 
         $projectLibs = array();
         $productLibs = array();