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

Merge branch 'release/21.7.8' into release/22.0.alpha1

Browse Source
This commit is contained in:
sunguangming
2025-12-29 07:52:33 +00:00
parent 5523416ed7 0109f278aa
commit e0e06d9ca3
268 changed files with 2652 additions and 1693 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+6 -4
View File
@@ -1629,11 +1629,12 @@ class doc extends control
$params = helper::safe64Decode($params);
parse_str($params, $params);
$this->view->params = $params;
$this->view->params = $params;
$this->view->objectType = $objectType;
$this->view->spaceList = $spaceList;
$this->view->typeList = $typeList;
$this->view->spaceList = $spaceList;
$this->view->typeList = $typeList;
$this->view->from = $from;
$this->display();
}
@@ -1997,7 +1998,7 @@ class doc extends control
$this->view->spaceType = $spaceType;
$this->view->space = $space;
$this->view->doc = $doc;
$this->view->spaces = $this->doc->getAllSubSpaces();
$this->view->spaces = $this->doc->getAllSubSpaces($this->app->tab != 'doc' ? $this->app->tab : 'all');
$this->view->libPairs = $libPairs;
$this->view->optionMenu = $chapterAndDocs;
$this->view->groups = $this->loadModel('group')->getPairs();
@@ -2255,6 +2256,7 @@ class doc extends control
}
if($isNotDocTab && in_array($type, array('product', 'project', 'execution')))
{
if($type == 'product' && $spaceID == 0) $spaceID = (int)$this->cookie->preProductID;
$this->doc->setMenuByType($type, $spaceID, $libID);
$objectKey = $type . 'ID';
$this->view->$objectKey = $spaceID;