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

Merge branch 'tanghucheng_fixbug' into 'master'

Browse Source 
* Fix bug #30282.

See merge request easycorp/zentaopms!6386
This commit is contained in:
王怡栋
2022-11-25 08:14:24 +00:00
parent c4b3e8d18a 8f20075c51
commit 3707c77b53
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/config.php
+2 -2
View File
@@ -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';
module/transfer/model.php
-1
View File
@@ -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;
}