diff --git a/module/testcase/config.php b/module/testcase/config.php index c27e038b75..8c773a34ac 100644 --- a/module/testcase/config.php +++ b/module/testcase/config.php @@ -29,12 +29,13 @@ $config->testcase->exportFields = ' pri, type, stage, status, bugsAB, resultsAB, stepNumberAB, lastRunner, lastRunDate, lastRunResult, openedBy, openedDate, lastEditedBy, lastEditedDate, version, linkCase, files'; -$config->testcase->customCreateFields = 'story,stage,pri,keywords'; -$config->testcase->customBatchCreateFields = 'module,scene,stage,story,pri,precondition,keywords,review'; -$config->testcase->customBatchEditFields = 'module,scene,story,stage,precondition,status,pri,keywords'; +$config->testcase->list = new stdclass(); +$config->testcase->list->customCreateFields = 'story,stage,pri,keywords'; +$config->testcase->list->customBatchCreateFields = 'module,scene,stage,story,pri,precondition,keywords,review'; +$config->testcase->list->customBatchEditFields = 'module,scene,story,stage,precondition,status,pri,keywords'; $config->testcase->custom = new stdclass(); -$config->testcase->custom->createFields = $config->testcase->customCreateFields; +$config->testcase->custom->createFields = $config->testcase->list->customCreateFields; $config->testcase->custom->batchCreateFields = 'module,scene,story,%s'; $config->testcase->custom->batchEditFields = 'branch,module,scene,stage,status,pri,story'; diff --git a/module/testcase/control.php b/module/testcase/control.php index 874b52a50e..6a5fb529a8 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -269,7 +269,7 @@ class testcase extends control /* 设置自定义字段。 */ /* Set custom fields. */ - foreach(explode(',', $this->config->testcase->customCreateFields) as $field) $customFields[$field] = $this->lang->testcase->$field; + foreach(explode(',', $this->config->testcase->list->customCreateFields) as $field) $customFields[$field] = $this->lang->testcase->$field; $this->view->customFields = $customFields; $this->view->showFields = $this->config->testcase->custom->createFields; diff --git a/module/testcase/ui/batchcreate.html.php b/module/testcase/ui/batchcreate.html.php index a20024e0f3..e095f24e1b 100644 --- a/module/testcase/ui/batchcreate.html.php +++ b/module/testcase/ui/batchcreate.html.php @@ -23,7 +23,7 @@ foreach(explode(',', $config->testcase->create->requiredFields) as $field) if($field) { $requiredFields[$field] = ''; - if(strpos(",{$config->testcase->customBatchCreateFields},", ",{$field},") !== false) $visibleFields[$field] = ''; + if(strpos(",{$config->testcase->list->customBatchCreateFields},", ",{$field},") !== false) $visibleFields[$field] = ''; } } $hiddenStory = isAjaxRequest('modal') && $story; diff --git a/module/testcase/ui/batchedit.html.php b/module/testcase/ui/batchedit.html.php index c97b1bef4a..abfac7333a 100644 --- a/module/testcase/ui/batchedit.html.php +++ b/module/testcase/ui/batchedit.html.php @@ -42,7 +42,7 @@ else $requiredFields[$field] = $field; - if(strpos(",{$config->testcase->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = $field; + if(strpos(",{$config->testcase->list->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = $field; } $items = array(); diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index 9de549c79e..a4f7e1f22e 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -42,7 +42,7 @@ if($field) { $requiredFields[$field] = ''; - if(strpos(",{$config->testcase->customBatchCreateFields},", ",{$field},") !== false) $visibleFields[$field] = ''; + if(strpos(",{$config->testcase->list->customBatchCreateFields},", ",{$field},") !== false) $visibleFields[$field] = ''; } } $colspan = count($visibleFields) + 3; diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index 414ec2ab3e..381fae26d6 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -41,7 +41,7 @@ if($field) { $requiredFields[$field] = ''; - if(strpos(",{$config->testcase->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = ''; + if(strpos(",{$config->testcase->list->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = ''; } } ?> diff --git a/module/testcase/zen.php b/module/testcase/zen.php index 2e65eb047f..364f109d9b 100644 --- a/module/testcase/zen.php +++ b/module/testcase/zen.php @@ -968,7 +968,7 @@ class testcaseZen extends testcase /* 设置自定义字段。 */ /* Set custom fields. */ - foreach(explode(',', $this->config->testcase->customBatchEditFields) as $field) $customFields[$field] = $this->lang->testcase->$field; + foreach(explode(',', $this->config->testcase->list->customBatchEditFields) as $field) $customFields[$field] = $this->lang->testcase->$field; $this->view->customFields = $customFields; $this->view->showFields = $this->config->testcase->custom->batchEditFields; @@ -1001,7 +1001,7 @@ class testcaseZen extends testcase $libraries = $this->loadModel('caselib')->getLibraries(); /* Remove story custom fields from caselib */ - $this->config->testcase->customBatchEditFields = str_replace(',story', '', $this->config->testcase->customBatchEditFields); + $this->config->testcase->list->customBatchEditFields = str_replace(',story', '', $this->config->testcase->list->customBatchEditFields); $this->config->testcase->custom->batchEditFields = str_replace(',story', '', $this->config->testcase->custom->batchEditFields); /* Set caselib menu. */ @@ -1257,7 +1257,7 @@ class testcaseZen extends testcase /* 设置自定义字段和展示字段。 */ /* Set custom fields and show fields. */ - foreach(explode(',', $this->config->testcase->customBatchCreateFields) as $field) + foreach(explode(',', $this->config->testcase->list->customBatchCreateFields) as $field) { if($product->type != 'normal') $customFields[$product->type] = $this->lang->product->branchName[$product->type]; $customFields[$field] = $this->lang->testcase->$field;