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

* [feedback#6670,0.5h] get workflow fields.

Browse Source
This commit is contained in:
liumengyi
2024-08-06 17:17:18 +08:00
committed by 綦新志
parent e4f597cdd7
commit ca0ca5dffe
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/model.php
+19
View File
@@ -870,6 +870,12 @@ class pivotModel extends model
{
$this->app->loadLang($fieldObject);
if(isset($this->lang->$fieldObject->$relatedField)) $colLabel = $this->lang->$fieldObject->$relatedField;
if($this->config->edition != 'open')
{
$workflowFields = $this->loadModel('workflowfield')->getFieldPairs($fieldObject);
if(isset($workflowFields[$relatedField])) $colLabel = $workflowFields[$relatedField];
}
}
if(isset($langs[$group]) and !empty($langs[$group][$clientLang])) $colLabel = $langs[$group][$clientLang];
@@ -1624,6 +1630,12 @@ class pivotModel extends model
$object = zget($fields[$key], 'object', '');
if($object)
{
if($this->config->edition != 'open')
{
$workflowFields = $this->loadModel('workflowfield')->getFieldPairs($object);
if(isset($workflowFields[$key])) return $workflowFields[$key];
}
$this->app->loadLang($object);
if(isset($this->lang->{$object}->{$key})) return $this->lang->{$object}->{$key};
}
@@ -2026,6 +2038,13 @@ class pivotModel extends model
case 'number':
if($source)
{
if($this->config->edition != 'open')
{
$fieldObject = $this->loadModel('workflowfield')->getByField($object, $field);
$options = $this->workflowfield->getFieldOptions($fieldObject);
if(!empty($options)) break;
}
$options = array();
if(is_array($source))
{