Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3

This commit is contained in:
tianshujie
2023-04-04 17:30:04 +08:00
8 changed files with 17 additions and 111 deletions
+2 -1
View File
@@ -1194,7 +1194,7 @@ class doc extends control
*/
public function tableContents($type = 'custom', $objectID = 0, $libID = 0, $moduleID = 0, $browseType = 'all', $orderBy = 'status,id_desc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$this->view->isFirstLoad = $objectID == 0 ? 'true' : 'false';
$isFirstLoad = $libID == 0 ? true : false;
$this->session->set('createProjectLocate', $this->app->getURI(true), 'doc');
$this->session->set('spaceType', $type, 'doc');
@@ -1253,6 +1253,7 @@ class doc extends control
$this->view->type = $type;
$this->view->objectType = $type;
$this->view->browseType = $browseType;
$this->view->isFirstLoad = $isFirstLoad;
$this->view->param = $queryID;
$this->view->users = $this->user->getPairs('noletter');
$this->view->libTree = $libTree;