diff --git a/module/extension/control.php b/module/extension/control.php index 8ed0d879a7..e3c0b0a6b8 100644 --- a/module/extension/control.php +++ b/module/extension/control.php @@ -1,4 +1,5 @@ depends = ''; $info = $this->parseExtensionCFG($extension); - foreach($info as $key => $value) if(isset($data->$key)) $data->$key = is_null($value) ? '' : $value; + foreach($info as $key => $value) + { + if(isset($data->$key)) $data->$key = is_null($value) ? '' : $value; + } + if(isset($info->zentaoversion)) $data->zentaoCompatible = $info->zentaoversion; if(isset($info->zentao['compatible'])) $data->zentaoCompatible = $info->zentao['compatible']; if(isset($info->depends)) $data->depends = json_encode($info->depends); @@ -215,6 +221,7 @@ class extensionModel extends model } /** + * 根据插件代号从插件包获取配置信息。 * Parse extension's config file. * * @param string $extension diff --git a/module/extension/test/model/getinfofrompackage.php b/module/extension/test/model/getinfofrompackage.php new file mode 100755 index 0000000000..88c24f31da --- /dev/null +++ b/module/extension/test/model/getinfofrompackage.php @@ -0,0 +1,24 @@ +#!/usr/bin/env php +getInfoFromPackage(); +timeout=0 +cid=1 + +- 获取插件1的详细信息 + - 属性name @code1 + - 属性code @code1 + - 属性version @unknown + - 属性author @unknown + - 属性desc @code1 + +*/ + +global $tester; +$tester->loadModel('extension'); + +r($tester->extension->getInfoFromPackage('code1')) && p('name,code,version,author,desc') && e('code1,code1,unknown,unknown,code1'); // 获取插件1的详细信息 diff --git a/module/misc/control.php b/module/misc/control.php index 3326a52033..b03a3a3900 100644 --- a/module/misc/control.php +++ b/module/misc/control.php @@ -1,4 +1,5 @@ loadModel('user')->getPairs('noclosed|noletter'); foreach($testtasks as $testtask) { + if(empty($testtask->members)) continue; + $members = array(); foreach(explode(',', $testtask->members) as $member) $members[] = zget($users, $member); $testtask->members = implode(',', array_unique($members)); @@ -1150,9 +1152,9 @@ class testtask extends control } /** - * AJAX: Get executionID by buildID. - * - * @param int $buildID + * AJAX: Get executionID by buildID. + * + * @param int $buildID * @access public * @return int */