Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #7433.

Browse Source
This commit is contained in:
holan20180123
2020-07-20 10:39:29 +08:00
parent 3cba60eb57
commit edfe4ccd97
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+9 -8
View File
@@ -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();
}
module/testcase/model.php
+1 -1
View File
@@ -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)
{
module/testcase/view/batchedit.html.php
+12 -1
View File
@@ -85,7 +85,18 @@
<tr class='text-center'>
<td><?php echo $caseID . html::hidden("caseIDList[$caseID]", $caseID);?></td>
<td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'> <?php echo html::select("pris[$caseID]", $priList, $cases[$caseID]->pri, 'class=form-control');?></td>
<td class='<?php echo zget($visibleFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');?></td>
<td class='<?php echo zget($visibleFields, 'status', 'hidden')?>'>
<?php
if(!$forceNotReview and $cases[$caseID]->status == 'wait')
{
echo $lang->testcase->statusList['wait'];
}
else
{
echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');
}
?>
</td>
<?php if($branchProduct):?>
<td class='text-left<?php echo zget($visibleFields, 'branch', ' hidden')?>' style='overflow:visible'>
<?php $branchProductID = $productID ? $productID : $product->id;?>
module/testcase/view/view.html.php
+1 -1
View File
@@ -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&param=$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&param=$case->id", $case), "<i class='icon-copy'></i>", '', "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', '');
?>
<?php endif;?>
</div>