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

* Change the name of my spatial function.

Browse Source
This commit is contained in:
tianshujie
2023-04-06 16:57:14 +08:00
parent fc3accb1b0
commit bb84c7a731
11 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+4 -4
View File
@@ -994,7 +994,7 @@ class docModel extends model
unset($this->config->doc->search['fields']['module']);
}
elseif(in_array($type, array('product', 'project', 'execution', 'custom', 'book')))
elseif(in_array($type, array('product', 'project', 'execution', 'custom', 'mine')))
{
if(!isset($libs[$libID])) $libs[$libID] = $this->getLibById($libID);
@@ -1034,8 +1034,7 @@ class docModel extends model
$this->config->doc->search['queryID'] = $queryID;
/* Get the modules. */
$moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($libID, 'doc', $startModuleID = 0);
$this->config->doc->search['params']['module']['values'] = $moduleOptionMenu;
$this->config->doc->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($libID, 'doc', $startModuleID = 0);
if($type == 'index' || $type == 'view' || ($this->app->rawMethod != 'contribute' and $libID == 0))
{
@@ -2666,7 +2665,8 @@ class docModel extends model
$object->id = 0;
}
$tab = strpos(',doc,product,project,execution,', ",{$this->app->tab},") !== false ? $this->app->tab : 'doc';
$tab = strpos(',doc,product,project,execution,', ",{$this->app->tab},") !== false ? $this->app->tab : 'doc';
$type = $type == 'mine' ? 'my' : $type;
if($tab != 'doc' and method_exists($type . 'Model', 'setMenu'))
{
$this->loadModel($type)->setMenu($objectID);