* Fix bug#29549,#29654.

This commit is contained in:
xieqiyu
2022-11-11 17:06:48 +08:00
parent a4785c2760
commit fde21ff897
-8
View File
@@ -930,13 +930,6 @@ class docModel extends model
{
$this->loadModel('product');
/* Fixed search modal for doc view. */
if($this->app->getMethodName() == 'objectlibs')
{
$queryName = $type . 'Doc';
$type = 'objectLibs';
}
if($this->app->rawMethod == 'contribute')
{
$this->config->doc->search['module'] = 'contributeDoc';
@@ -960,7 +953,6 @@ class docModel extends model
}
else
{
if(isset($queryName)) $this->config->doc->search['module'] = $queryName;
$products = $this->product->getPairs('nocode', $this->session->project);
$this->config->doc->search['params']['execution']['values'] = array('' => '') + $this->loadModel('execution')->getPairs($this->session->project, 'all', 'noclosed') + array('all' => $this->lang->doc->allExecutions);
$this->config->doc->search['params']['lib']['values'] = array('' => '', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all);