diff --git a/module/transfer/model.php b/module/transfer/model.php index ee6920e482..5cd0246cb9 100644 --- a/module/transfer/model.php +++ b/module/transfer/model.php @@ -318,6 +318,7 @@ class transferModel extends model } /** + * 初始化系统数据字段列表(project,execution,product,user)。 * Init system datafields list. * * @access public @@ -326,12 +327,13 @@ class transferModel extends model public function initSysDataFields() { $this->commonActions(); - $dataList = array(); - + $dataList = array(); $sysDataFields = explode(',', $this->transferConfig->sysDataFields); foreach($sysDataFields as $field) { + /* 调用对应模块getPairs方法获取id => name 关联数据。 */ + /* Call getPairs method of corresponding module to get id => name related data. */ $dataList[$field] = $this->loadModel($field)->getPairs(); if(!isset($dataList[$field][0])) $dataList[$field][0] = ''; diff --git a/module/transfer/test/model/initsysdatafields.php b/module/transfer/test/model/initsysdatafields.php new file mode 100644 index 0000000000..428cb55d78 --- /dev/null +++ b/module/transfer/test/model/initsysdatafields.php @@ -0,0 +1,31 @@ +#!/usr/bin/env php +gen(5); +zdTable('project')->config('execution')->gen(30); + +$userview = zdTable('userview'); +$userview->account->range('admin,user1,user2'); +$userview->gen(3); +su('admin'); + +/** + +title=测试 transfer->initControl(); +timeout=0 +cid=1 + +- 测试通过project模块的getpairs方法获取数据第project条的1属性 @项目11 +- 测试通过user模块的getpairs方法获取数据第user条的admin属性 @admin +- 测试当methodName 不为'ajaxgettbody', 'ajaxgetoptions', 'showimport'时获取到的user数据第user条的user1属性 @用户1(#user1) + +*/ +global $tester, $app; +$app->methodName = 'ajaxgettbody'; +$transfer = $tester->loadModel('transfer'); + +r($transfer->initSysDataFields()) && p('project:1') && e('项目11'); // 测试通过project模块的getpairs方法获取数据 +r($transfer->initSysDataFields()) && p('user:admin') && e('admin'); // 测试通过user模块的getpairs方法获取数据 + +$app->methodName = 'browse'; +r($transfer->initSysDataFields()) && p('user:user1') && e('用户1(#user1)'); // 测试当methodName 不为'ajaxgettbody', 'ajaxgetoptions', 'showimport'时获取到的user数据