diff --git a/module/story/css/common.css b/module/story/css/common.css index bd99600afe..202f6dd39f 100644 --- a/module/story/css/common.css +++ b/module/story/css/common.css @@ -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;} diff --git a/module/transfer/control.php b/module/transfer/control.php index 65d13bbc52..aa379ba074 100755 --- a/module/transfer/control.php +++ b/module/transfer/control.php @@ -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);