Merge branch 'sprint/208_tianshujie_24391' into 'master'
* Fix bug #24391. See merge request easycorp/zentaopms!4205
This commit is contained in:
@@ -124,6 +124,7 @@ class custom extends control
|
||||
{
|
||||
foreach($postArray->data->keys as $key)
|
||||
{
|
||||
if($module == 'testtask' and $field == 'typeList' and empty($key)) continue;
|
||||
if(in_array($key, $keys)) return $this->send(array('result' => 'fail', 'message' => sprintf($this->lang->custom->notice->repeatKey, $key)));;
|
||||
$keys[] = $key;
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ $lang->custom->testcase->fields['review'] = 'Validation Requise';
|
||||
|
||||
$lang->custom->testtask = new stdClass();
|
||||
$lang->custom->testtask->fields['statusList'] = 'Statut';
|
||||
$lang->custom->testtask->fields['typeList'] = 'Type';
|
||||
$lang->custom->testtask->fields['typeList'] = 'Type de test';
|
||||
$lang->custom->testtask->fields['priList'] = 'Priorité';
|
||||
|
||||
$lang->custom->todo = new stdClass();
|
||||
|
||||
@@ -206,6 +206,7 @@ $lang->testtask->unitTag['lastWeek'] = 'Last week';
|
||||
$lang->testtask->unitTag['thisMonth'] = 'This month';
|
||||
$lang->testtask->unitTag['lastMonth'] = 'Last month';
|
||||
|
||||
$lang->testtask->typeList[''] = '';
|
||||
$lang->testtask->typeList['integrate'] = 'Integrate';
|
||||
$lang->testtask->typeList['system'] = 'System';
|
||||
$lang->testtask->typeList['acceptance'] = 'Acceptance';
|
||||
|
||||
@@ -206,6 +206,7 @@ $lang->testtask->unitTag['lastWeek'] = 'Last week';
|
||||
$lang->testtask->unitTag['thisMonth'] = 'This month';
|
||||
$lang->testtask->unitTag['lastMonth'] = 'Last month';
|
||||
|
||||
$lang->testtask->typeList[''] = '';
|
||||
$lang->testtask->typeList['integrate'] = 'Integration';
|
||||
$lang->testtask->typeList['system'] = 'System';
|
||||
$lang->testtask->typeList['acceptance'] = 'Acceptance';
|
||||
|
||||
@@ -206,6 +206,7 @@ $lang->testtask->unitTag['lastWeek'] = 'Last week';
|
||||
$lang->testtask->unitTag['thisMonth'] = 'This month';
|
||||
$lang->testtask->unitTag['lastMonth'] = 'Last month';
|
||||
|
||||
$lang->testtask->typeList[''] = '';
|
||||
$lang->testtask->typeList['integrate'] = 'Integrate';
|
||||
$lang->testtask->typeList['system'] = 'System';
|
||||
$lang->testtask->typeList['acceptance'] = 'Acceptance';
|
||||
|
||||
@@ -206,6 +206,7 @@ $lang->testtask->unitTag['lastWeek'] = '上周';
|
||||
$lang->testtask->unitTag['thisMonth'] = '本月';
|
||||
$lang->testtask->unitTag['lastMonth'] = '上月';
|
||||
|
||||
$lang->testtask->typeList[''] = '';
|
||||
$lang->testtask->typeList['integrate'] = '集成测试';
|
||||
$lang->testtask->typeList['system'] = '系统测试';
|
||||
$lang->testtask->typeList['acceptance'] = '验收测试';
|
||||
|
||||
Reference in New Issue
Block a user