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

* Fix bug #37336.

Browse Source
This commit is contained in:
tanghucheng
2023-08-16 16:20:55 +08:00
parent a0648a2fe3
commit 51eb2ef4fc
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/transfer/config.php
+2
View File
@@ -29,5 +29,7 @@ $config->transfer->dateMatch = '/[1-9]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3
$config->transfer->hasChildDataFields = explode(',', 'task,story');
$config->transfer->requiredFields = array('module', 'pri');
$config->transfer->lazyLoading = false;
$config->transfer->showImportCount = 20;
module/transfer/control.php
+2 -1
View File
@@ -208,7 +208,8 @@ class transfer extends control
$fieldList = $this->transfer->initFieldList($model, $fields, false);
if(empty($fieldList[$field]['values'])) $fieldList[$field]['values'] = array();
if(empty($fieldList[$field]['values'])) $fieldList[$field]['values'] = array('' => '');
if(!in_array($field, $this->config->transfer->requiredFields)) $fieldList[$field]['values'][''] = '';
$multiple = $fieldList[$field]['control'] == 'multiple' ? 'multiple' : '';
module/transfer/model.php
+1
View File
@@ -1464,6 +1464,7 @@ class transferModel extends model
{
if(!empty($values[$selected])) $options = array($selected => $values[$selected]);
if(empty($options) and is_array($values)) $options = array_slice($values, 0, 1, true);
if(!isset($options['']) and !in_array($field, $this->config->transfer->requiredFields)) $options[''] = '';
}
if($control == 'select') $html .= '<td>' . html::select("$name", $options, $selected, "class='form-control picker-select nopicker' data-field='{$field}' data-index='{$row}'") . '</td>';