diff --git a/module/story/config.php b/module/story/config.php index e5003141eb..72e8a36ee3 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -145,8 +145,8 @@ $config->story->datatable->fieldList['branch']['title'] = 'branch'; $config->story->datatable->fieldList['branch']['fixed'] = 'no'; $config->story->datatable->fieldList['branch']['width'] = '100'; $config->story->datatable->fieldList['branch']['required'] = 'no'; -$config->story->datatable->fieldList['branch']['control'] = 'multiple'; -$config->story->datatable->fieldList['branch']['dataSource'] = array('module' => 'story', 'method' => 'getRelatedObjects', 'params' => 'branch&id,name'); +$config->story->datatable->fieldList['branch']['control'] = 'select'; +$config->story->datatable->fieldList['branch']['dataSource'] = array('module' => 'branch', 'method' => 'getPairs', 'params' => '$productID&active'); $config->story->datatable->fieldList['module']['title'] = 'module'; $config->story->datatable->fieldList['module']['control'] = 'select'; diff --git a/module/transfer/model.php b/module/transfer/model.php index 62ac74b80c..8da0aea25f 100644 --- a/module/transfer/model.php +++ b/module/transfer/model.php @@ -507,7 +507,6 @@ class transferModel extends model $modelData = $this->getDatasByFile($tmpFile); } if(isset($fields['id'])) unset($fields['id']); - $this->session->set($model . 'TemplateFields', array_keys($fields)); return $modelData; }