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

* finish task #2535.

Browse Source
This commit is contained in:
chenfeiCF
2016-04-14 10:21:27 +08:00
parent ea4c94bcc2
commit 1d42f477f8
4 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/config.php
+2
View File
@@ -26,10 +26,12 @@ $config->testcase->exportFields = '
$config->testcase->customCreateFields = 'stage,story,pri,keywords';
$config->testcase->customBatchCreateFields = 'module,stage,story,pri,precondition,keywords';
$config->testcase->customBatchEditFields = 'module,stage,precondition,status,pri,keywords';
$config->testcase->custom = new stdclass();
$config->testcase->custom->create = $config->testcase->customCreateFields;
$config->testcase->custom->batchcreate = $config->testcase->customBatchCreateFields;
$config->testcase->custom->batchedit = $config->testcase->customBatchEditFields;
global $lang;
$config->testcase->search['module'] = 'testcase';
module/testcase/control.php
+5
View File
@@ -587,6 +587,11 @@ class testcase extends control
$this->lang->testcase->priList['ditto'] = $this->lang->testcase->ditto;
$this->lang->testcase->typeList['ditto'] = $this->lang->testcase->ditto;
/* Set custom. */
foreach(explode(',', $this->config->testcase->customBatchEditFields) as $field) $customFields[$field] = $this->lang->testcase->$field;
$this->view->customFields = $customFields;
$this->view->showFields = $this->config->testcase->custom->batchedit;
/* Assign. */
$this->view->position[] = $this->lang->testcase->common;
$this->view->position[] = $this->lang->testcase->batchEdit;
module/testcase/model.php
+2
View File
@@ -591,6 +591,8 @@ class testcaseModel extends model
$case->status = $data->statuses[$caseID];
$case->module = $data->modules[$caseID];
$case->title = $data->titles[$caseID];
$case->precondition = $data->precondition[$caseID];
$case->keywords = $data->keywords[$caseID];
$case->type = $data->types[$caseID];
$case->stage = empty($data->stages[$caseID]) ? '' : implode(',', $data->stages[$caseID]);
module/testcase/view/batchedit.html.php
+28 -12
View File
@@ -16,19 +16,31 @@
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['testcase']);?></span>
<strong><small class='text-muted'><?php echo html::icon($lang->icons['batchEdit']);?></small> <?php echo $lang->testcase->common . $lang->colon . $lang->testcase->batchEdit;?></strong>
<div class='actions'>
<button type="button" class="btn btn-default" data-toggle="customModal"><i class='icon icon-cog'></i> </button>
</div>
</div>
</div>
<?php
$hasFields = array();
foreach(explode(',', $showFields) as $field)
{
if($field)$hasFields[$field] = '';
}
?>
<form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>">
<table class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-50px'><?php echo $lang->idAB;?></th>
<th class='w-70px'><?php echo $lang->priAB;?></th>
<th class='w-100px'><?php echo $lang->statusAB;?></th>
<th class='w-150px'><?php echo $lang->testcase->module;?></th>
<th class='w-70px<?php echo zget($hasFields, 'pri', ' hidden')?>'> <?php echo $lang->priAB;?></th>
<th class='w-100px<?php echo zget($hasFields, 'status', ' hidden')?>'><?php echo $lang->statusAB;?></th>
<th class='w-150px<?php echo zget($hasFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
<th><?php echo $lang->testcase->title;?></th>
<th class='w-120px'><?php echo $lang->testcase->type;?></th>
<th class='w-340px'><?php echo $lang->testcase->stage;?></th>
<th class='<?php echo zget($hasFields, 'precondition', 'hidden')?>'> <?php echo $lang->testcase->precondition;?></th>
<th class='w-100px<?php echo zget($hasFields, 'keywords', ' hidden')?>'><?php echo $lang->testcase->keywords;?></th>
<th class='w-340px<?php echo zget($hasFields, 'stage', ' hidden')?>'> <?php echo $lang->testcase->stage;?></th>
</tr>
</thead>
<tbody>
@@ -44,21 +56,25 @@
?>
<tr class='text-center'>
<td><?php echo $caseID . html::hidden("caseIDList[$caseID]", $caseID);?></td>
<td><?php echo html::select("pris[$caseID]", $priList, $cases[$caseID]->pri, 'class=form-control');?></td>
<td><?php echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');?></td>
<td class='text-left' style='overflow:visible'> <?php echo html::select("modules[$caseID]", $modules, $cases[$caseID]->module, "class='form-control chosen'");?></td>
<td title='<?php echo $cases[$caseID]->title?>'><?php echo html::input("titles[$caseID]", $cases[$caseID]->title, 'class=form-control'); echo "<span class='star'>*</span>";?></td>
<td><?php echo html::select("types[$caseID]", $typeList, $cases[$caseID]->type, 'class=form-control');?></td>
<td class='text-left' style='overflow:visible'> <?php echo html::select("stages[$caseID][]", $lang->testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?></td>
<td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'> <?php echo html::select("pris[$caseID]", $priList, $cases[$caseID]->pri, 'class=form-control');?></td>
<td class='<?php echo zget($hasFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');?></td>
<td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$caseID]", $modules, $cases[$caseID]->module, "class='form-control chosen'");?></td>
<td title='<?php echo $cases[$caseID]->title?>'><?php echo html::input("titles[$caseID]", $cases[$caseID]->title, 'class=form-control'); echo "<span class='star'>*</span>";?></td>
<td><?php echo html::select("types[$caseID]", $typeList, $cases[$caseID]->type, 'class=form-control');?></td>
<td class='<?php echo zget($hasFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$caseID]", $cases[$caseID]->precondition, "class='form-control'")?></td>
<td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'> <?php echo html::input("keywords[$caseID]", $cases[$caseID]->keywords, "class='form-control'");?></td>
<td class='text-left<?php echo zget($hasFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stages[$caseID][]", $lang->testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?></td>
</tr>
<?php endforeach;?>
<?php if(isset($suhosinInfo)):?>
<tr><td colspan='<?php echo $this->config->testcase->batchEdit->columns;?>'><div class='alert alert-info'><?php echo $suhosinInfo;?></div></td></tr>
<tr><td colspan='<?php echo count($hasFields) + 3;?>'><div class='alert alert-info'><?php echo $suhosinInfo;?></div></td></tr>
<?php endif;?>
</tbody>
<tfoot>
<tr><td colspan='<?php echo $this->config->testcase->batchEdit->columns;?>' class='text-center'><?php echo html::submitButton();?></td></tr>
<tr><td colspan='<?php echo count($hasFields) + 3;?>' class='text-center'><?php echo html::submitButton();?></td></tr>
</tfoot>
</table>
</form>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=testcase&section=custom&key=batchedit')?>
<?php include '../../common/view/customfield.html.php';?>
<?php include '../../common/view/footer.html.php';?>