This commit is contained in:
tanghucheng
2022-08-23 09:27:56 +08:00
parent 1ff75bb2af
commit b9d031bda1
2 changed files with 17 additions and 4 deletions
+1 -1
View File
@@ -17,7 +17,7 @@ $config->port->datetimeFeilds = '';
$config->port->listFields = '';
$config->port->sysLangFields = ',pri,status,type,mode,severity,os,browser,resolution,confirmed,source,reviewResult,stage,change,category';
$config->port->sysDataFields = 'execution,product,user';
$config->port->userFields = 'assignedTo,openedBy,finishedBy,canceledBy,closedBy,lastEditedBy,lastRunner,resolvedBy,reviewedBy';
$config->port->userFields = 'assignedTo,openedBy,finishedBy,canceledBy,closedBy,lastEditedBy,lastRunner,resolvedBy,reviewedBy,mailto';
$config->port->defaultZeroField = 'severity,pri';
$config->port->defaultEmptyField = '';
+16 -3
View File
@@ -269,6 +269,12 @@ class portModel extends model
$modelFieldList['values'] = $this->initValues($model, $field, $modelFieldList, $withKey);
$fieldList[$field] = $modelFieldList;
}
if(!empty($fieldList['mailto']))
{
$fieldList['mailto']['control'] = 'multiple';
$fieldList['mailto']['values'] = $this->portConfig->sysDataList['user'];
}
return $fieldList;
}
@@ -403,7 +409,11 @@ class portModel extends model
$sysDataFields = explode(',', $this->portConfig->sysDataFields);
foreach($sysDataFields as $field) $dataList[$field] = $this->loadModel($field)->getPairs();
foreach($sysDataFields as $field)
{
$dataList[$field] = $this->loadModel($field)->getPairs();
if($field == 'user') $dataList[$field] = $this->loadModel($field)->getPairs('noclosed|nodeleted|noletter');
}
return $dataList;
}
@@ -560,9 +570,12 @@ class portModel extends model
{
if($fieldList[$field]['control'] == 'multiple')
{
$multiple = '';
$multiple = '';
$separator = $field == 'mailto' ? ',' : "\n";
$multipleLsit = explode(',', $value);
foreach($multipleLsit as $tmpValue) $multiple .= "\n" . zget($exportDatas[$field], $tmpValue);
foreach($multipleLsit as $key => $tmpValue) $multipleLsit[$key] = zget($exportDatas[$field], $tmpValue);
$multiple = join($separator, $multipleLsit);
$rows[$id]->$field = $multiple;
}
else