This commit is contained in:
holan20180123
2021-05-19 13:25:44 +08:00
parent 478b7dcbb7
commit 7d27baa047
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -731,7 +731,7 @@ class actionModel extends model
if(is_numeric($projectID)) $executions = $this->loadModel('execution')->getPairs($projectID);
$this->loadModel('doc');
$libs = $this->doc->getLibs('all');
$libs = $this->doc->getLibs('includeDeleted');
$docs = $this->doc->getPrivDocs(array_keys($libs), 0, 'all');
$actionCondition = $this->getActionCondition();
+2 -2
View File
@@ -37,10 +37,10 @@ class docModel extends model
*/
public function getLibs($type = '', $extra = '', $appendLibs = '', $objectID = 0)
{
if($type == 'all')
if($type == 'all' or $type == 'includeDeleted')
{
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
->where('deleted')->eq(0)
->beginIF($type == 'all')->where('deleted')->eq(0)->fi()
->orderBy('id_desc')
->query();
}