Merge branch 'fixbug_tanghucheng' into 'master'

* Fix bug for import testcase.

See merge request easycorp/zentaopms!6884
This commit is contained in:
王怡栋
2023-02-08 08:28:23 +00:00
2 changed files with 1 additions and 2 deletions
-1
View File
@@ -25,7 +25,6 @@
.popover.bottom .arrow{border-bottom-color:#ffffff;}
.popover-icon {float:left;}
.popover .content {margin-left:25px;overflow: overlay;}
.hide {display:none !important;}
.twins > a.viewlink {padding:6px;white-space: nowrap;overflow: hidden;display: inline-flex;max-width: 70%;}
.twins > span {max-width: 60px;white-space: nowrap;overflow: hidden;}
.tooltip-inner {max-width: 500px;}
+1 -1
View File
@@ -152,7 +152,7 @@ class transfer extends control
$this->loadModel($model);
$importFields = !empty($_SESSION[$model . 'TemplateFields']) ? $_SESSION[$model . 'TemplateFields'] : $this->config->$model->templateFields;
if($model == 'testcase' and !empty($_SESSION[$model . 'TemplateFields'])) $this->config->$model->templateFields = implode(',', $importFields);
if($model == 'testcase' and !empty($_SESSION[$model . 'TemplateFields']) and is_array($importFields)) $this->config->$model->templateFields = implode(',', $importFields);
$fields = $this->transfer->initFieldList($model, $importFields, false);
$formatDatas = $this->transfer->format($model, $filter);
$datas = $this->transfer->getPageDatas($formatDatas, $pagerID);