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

* Fix bug #49118, show extend fields.

Browse Source
This commit is contained in:
liumengyi
2024-05-24 14:51:45 +08:00
parent ed2e41c770
commit fae18ca83e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/dtable/v1.php
+10 -4
View File
@@ -141,6 +141,8 @@ class dtable extends wg
$colConfigs = $this->prop('cols');
$dataPairs = $this->prop('userMap', array());
$moduleName = $app->getModuleName();
$methodName = $app->getMethodName();
foreach($colConfigs as $field => &$config)
{
@@ -166,15 +168,13 @@ class dtable extends wg
{
if($config['type'] === 'pri' && !isset($config['priList']) && !$this->prop('priList'))
{
$moduleName = $app->getModuleName();
if(isset($lang->$moduleName->priList)) $this->setProp('priList', $lang->$moduleName->priList);
elseif($app->getMethodName() === 'task') $this->setProp('priList', $lang->task->priList);
elseif($methodName === 'task') $this->setProp('priList', $lang->task->priList);
}
if($config['type'] === 'severity' && !isset($config['severityList']) && !$this->prop('severityList'))
{
$moduleName = $app->getModuleName();
if(isset($lang->$moduleName->severityList)) $this->setProp('severityList', $lang->$moduleName->severityList);
elseif($app->getMethodName() === 'bug') $this->setProp('priList', $lang->bug->severityList);
elseif($methodName === 'bug') $this->setProp('priList', $lang->bug->severityList);
}
if($config['type'] === 'assign' && !isset($config['currentUser']) && isset($app->user) && !$this->prop('currentUser'))
{
@@ -205,6 +205,12 @@ class dtable extends wg
unset($config['modifier']);
}
}
if($config->edition != 'open')
{
$extendFields = $app->control->loadModel('workflowaction')->getFields($moduleName, $methodName);
$extendCols = $app->control->loadModel('flow')->buildDtableCols($extendFields);
if(!empty($extendCols)) $colConfigs = array_merge($colConfigs, $extendCols);
}
$this->setProp('cols', array_values($colConfigs));
}