diff --git a/module/testcase/control.php b/module/testcase/control.php index 6d9f6c2656..59607cec44 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -783,14 +783,15 @@ class testcase extends control $this->view->showFields = $this->config->testcase->custom->batchEditFields; /* Assign. */ - $this->view->position[] = $this->lang->testcase->common; - $this->view->position[] = $this->lang->testcase->batchEdit; - $this->view->caseIDList = $caseIDList; - $this->view->productID = $productID; - $this->view->branchProduct = $branchProduct; - $this->view->priList = array('ditto' => $this->lang->testcase->ditto) + $this->lang->testcase->priList; - $this->view->typeList = array('' => '', 'ditto' => $this->lang->testcase->ditto) + $this->lang->testcase->typeList; - $this->view->cases = $cases; + $this->view->position[] = $this->lang->testcase->common; + $this->view->position[] = $this->lang->testcase->batchEdit; + $this->view->caseIDList = $caseIDList; + $this->view->productID = $productID; + $this->view->branchProduct = $branchProduct; + $this->view->priList = array('ditto' => $this->lang->testcase->ditto) + $this->lang->testcase->priList; + $this->view->typeList = array('' => '', 'ditto' => $this->lang->testcase->ditto) + $this->lang->testcase->typeList; + $this->view->cases = $cases; + $this->view->forceNotReview = $this->testcase->forceNotReview(); $this->display(); } diff --git a/module/testcase/model.php b/module/testcase/model.php index 00b9125aea..648cee8e26 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -858,7 +858,6 @@ class testcaseModel extends model $case->lastEditedBy = $this->app->user->account; $case->lastEditedDate = $now; $case->pri = $data->pris[$caseID]; - $case->status = $data->statuses[$caseID]; $case->branch = $data->branches[$caseID]; $case->module = $data->modules[$caseID]; $case->story = $data->stories[$caseID]; @@ -868,6 +867,7 @@ class testcaseModel extends model $case->keywords = $data->keywords[$caseID]; $case->type = $data->types[$caseID]; $case->stage = empty($data->stages[$caseID]) ? '' : implode(',', $data->stages[$caseID]); + if(isset($data->statuses[$caseID])) $case->status = $data->statuses[$caseID]; foreach($extendFields as $extendField) { diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index 2a5deb3d9e..2af9fcd3c3 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -85,7 +85,18 @@ '> pri, 'class=form-control');?> - '>testcase->statusList, $cases[$caseID]->status, 'class=form-control');?> + '> + status == 'wait') + { + echo $lang->testcase->statusList['wait']; + } + else + { + echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control'); + } + ?> + ' style='overflow:visible'> id;?> diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 563f519959..11ae60e2c3 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -129,7 +129,7 @@ common::printIcon('testcase', 'edit',"caseID=$case->id", $case, 'button', '', '', 'showinonlybody'); if(!$isLibCase and $case->auto != 'unit') common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'button', 'copy'); if($isLibCase and common::hasPriv('caselib', 'createCase')) echo html::a($this->createLink('caselib', 'createCase', "libID=$case->lib&moduleID=$case->module¶m=$case->id", $case), "", '', "class='btn' title='{$lang->testcase->copy}'"); - common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', 'trash', 'hiddenwin', 'showinonlybody'); + common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', 'trash', 'hiddenwin', ''); ?>