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

Merge branch 'master' into 'tsj_fixbug'

Browse Source 
# Conflicts:
#   module/doc/model.php
#   module/group/lang/resource.php
This commit is contained in:
王怡栋
2023-04-18 00:25:53 +00:00
parent 04a8604aa6 7399979c28
commit d78cb60d48
5 changed files with 65 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+1 -1
View File
@@ -1127,7 +1127,7 @@ class docModel extends model
unset($this->config->doc->search['fields']['execution']);
}
if(in_array($type, array('view', 'collect', 'createdby'))) $libPairs = array('' => '') + $this->getLibs('all', 'withObject');
if(in_array($type, array('view', 'collect', 'createdby', 'editedby'))) $libPairs = array('' => '') + $this->getLibs('all', 'withObject');
$this->config->doc->search['module'] = $queryName;
$this->config->doc->search['params']['lib']['values'] = $libPairs + array('all' => $this->lang->doclib->all);