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

Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
holan20180123
2021-03-18 08:27:13 +08:00
parent 68b8659197 048ecf6850
commit b4ea48a130
23 changed files with 97 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+2 -2
View File
@@ -919,7 +919,7 @@ class doc extends control
$this->lang->product->switcherMenu = $this->product->getSwitcher($objectID);
$this->lang->noMenuModule[] = 'doc';
}
elseif($from == 'project')
elseif($from == 'project' or $from == 'execution')
{
if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc';
}
@@ -947,7 +947,7 @@ class doc extends control
$this->view->type = $type;
$this->view->object = $object;
$this->view->from = $$from;
$this->view->from = $from;
$this->view->libs = $this->doc->getLibsByObject($type, $objectID);
$this->view->canBeChanged = common::canModify($type, $object); // Determines whether an object is editable.
$this->display();