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

Merge branch release/21.7.8 of zentao/zentaopms (#12831)

Browse Source
This commit is contained in:
刘刚
2025-12-15 14:35:17 +08:00
committed by Gitfox
parent c168553f10 05614c1fd2
commit 45a1ff0389
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/model.class.php
+4 -4
View File
@@ -391,7 +391,7 @@ class model extends baseModel
if($this->config->edition == 'open') return array();
if(!empty($this->app->installing) || !empty($this->app->upgrading)) return array();
return $this->loadModel('flow')->getExtendFields($this->app->getModuleName(), $this->app->getMethodName(), $objectID);
return $this->loadModel('flow')->getExtendFields($this->app->rawModule, $this->app->rawMethod, $objectID);
}
/**
@@ -405,7 +405,7 @@ class model extends baseModel
if($this->config->edition == 'open') return array();
if(!empty($this->app->installing) || !empty($this->app->upgrading)) return array();
return $this->loadModel('workflowfield')->getExportFields($this->app->getModuleName());
return $this->loadModel('workflowfield')->getExportFields($this->app->rawModule);
}
/**
@@ -420,8 +420,8 @@ class model extends baseModel
if($this->config->edition == 'open') return '';
if(!empty($this->app->installing) || !empty($this->app->upgrading)) return '';
$moduleName = $this->app->getModuleName();
$methodName = $this->app->getMethodName();
$moduleName = $this->app->rawModule;
$methodName = $this->app->rawMethod;
$groupID = $this->loadModel('workflowgroup')->getGroupIDByDataID($moduleName, $objectID);
$action = $this->loadModel('workflowaction')->getByModuleAndAction($moduleName, $methodName, $groupID);