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

2021-04-09 16:44:25 +08:00
parent 6d4e721cc6 2e20a06ffa
commit 76fd1b8a46
12 changed files with 61 additions and 48 deletions
@@ -623,6 +623,7 @@ class doc extends control
        {
            $doc        = $this->doc->getByID($docID);
            $objectType = $this->dao->select('type')->from(TABLE_DOCLIB)->where('id')->eq($doc->lib)->fetch('type');
+            if($this->config->systemMode == 'classic' and $objectType == 'project') $objectType = 'execution'; 
            $this->doc->delete(TABLE_DOC, $docID);

            /* if ajax request, send result. */