diff --git a/module/testcase/ui/batchcreate.html.php b/module/testcase/ui/batchcreate.html.php index b0fd301ba2..676f2f843b 100644 --- a/module/testcase/ui/batchcreate.html.php +++ b/module/testcase/ui/batchcreate.html.php @@ -80,6 +80,8 @@ $items[] = array 'ditto' => true, ); +unset($lang->testcase->typeList['unit']); + /* Field of type. */ $items[] = array ( @@ -87,7 +89,7 @@ $items[] = array 'label' => $lang->testcase->type, 'control' => 'picker', 'items' => $lang->testcase->typeList, - 'value' => 1, + 'value' => 'feature', 'width' => '160px', 'required' => true, 'ditto' => true, diff --git a/module/testcase/ui/batchedit.html.php b/module/testcase/ui/batchedit.html.php index 0059c1e01c..0e31d6bdc4 100644 --- a/module/testcase/ui/batchedit.html.php +++ b/module/testcase/ui/batchedit.html.php @@ -34,16 +34,16 @@ else if(!$field) continue; $visibleFields[$field] = $field; } - + foreach(explode(',', $config->testcase->edit->requiredFields) as $field) { if(!$field) continue; - + $requiredFields[$field] = $field; - + if(strpos(",{$config->testcase->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = $field; } - + $items = array(); $items[] = array ( @@ -126,6 +126,8 @@ else 'control' => 'input', 'required' => true, ); + + unset($lang->testcase->typeList['unit']); $items[] = array ( 'name' => 'type', @@ -162,7 +164,7 @@ else 'hidden' => !isset($visibleFields['stage']), 'required' => isset($requiredFields['stage']), ); - + formBatchPanel ( on::change('[data-name=branch]', 'loadBranches'), diff --git a/module/testcase/ui/browse.html.php b/module/testcase/ui/browse.html.php index 231c9a2e58..7a13b1bab7 100644 --- a/module/testcase/ui/browse.html.php +++ b/module/testcase/ui/browse.html.php @@ -53,6 +53,7 @@ if($canBatchReview || $canBatchDelete || $canBatchChangeType || $canBatchConfirm $typeItems = array(); foreach($lang->testcase->typeList as $key => $type) { + if(!$key || $key == 'unit') continue; $typeItems[] = array('text' => $type, 'className' => 'batch-btn ajax-btn not-open-url', 'data-url' => helper::createLink('testcase', 'batchChangeType', "type={$key}")); } $navActions[] = array('text' => $lang->testcase->type, 'class' => 'not-hide-menu', 'items' => $typeItems); diff --git a/module/testcase/ui/create.html.php b/module/testcase/ui/create.html.php index df2ae9a29c..9b829ce2a4 100644 --- a/module/testcase/ui/create.html.php +++ b/module/testcase/ui/create.html.php @@ -15,10 +15,8 @@ jsVar('tab', $this->app->tab); if($app->tab == 'execution') jsVar('objectID', $executionID); if($app->tab == 'project') jsVar('objectID', $projectID); -foreach($lang->testcase->priList as $priKey => $priValue) -{ - if(empty($priValue)) unset($lang->testcase->priList[$priKey]); -} +$priList = array_filter($lang->testcase->priList); +unset($lang->testcase->typeList['unit']); formPanel ( @@ -222,7 +220,7 @@ formPanel ( width('80px'), set::name('pri'), - set::items($lang->testcase->priList), + set::items($priList), set::value($case->pri) ), ),