* finish task #2539.

This commit is contained in:
chenfeiCF
2016-04-14 09:14:31 +08:00
parent 650ec21b00
commit d80aa64136
4 changed files with 66 additions and 45 deletions
+52 -43
View File
@@ -22,24 +22,33 @@
<div class='actions'>
<?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=bug&params=' . helper::safe64Encode("productID=$productID&projectID=$projectID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn' data-width='600px'")?>
<?php echo html::commonButton($lang->pasteText, "data-toggle='myModal'")?>
<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' class='form-condensed' method='post' target='hiddenwin'>
<table class='table table-fixed table-form'>
<thead>
<tr>
<th class='w-50px'> <?php echo $lang->idAB;?></th>
<th class='w-120px'> <?php echo $lang->bug->module;?></th>
<th class='w-130px'> <?php echo $lang->bug->project;?></th>
<th class='w-150px'><?php echo $lang->bug->openedBuild;?> <span class='required'></span></th>
<th class='w-120px<?php echo zget($hasFields, 'module', ' hidden')?>'> <?php echo $lang->bug->module;?></th>
<th class='w-130px<?php echo zget($hasFields, 'project', ' hidden')?>'><?php echo $lang->bug->project;?></th>
<th><?php echo $lang->bug->openedBuild;?> <span class='required'></span></th>
<th><?php echo $lang->bug->title;?> <span class='required'></span></th>
<th> <?php echo $lang->bug->steps;?></th>
<th class='w-100px'> <?php echo $lang->typeAB;?></th>
<th class='w-80px'> <?php echo $lang->bug->severity;?></th>
<th class='w-120px'> <?php echo $lang->bug->os;?></th>
<th class='w-100px'> <?php echo $lang->bug->browser;?></th>
<th class='<?php echo zget($hasFields, 'steps', 'hidden')?>'> <?php echo $lang->bug->steps;?></th>
<th class='w-100px<?php echo zget($hasFields, 'type', ' hidden')?>'> <?php echo $lang->typeAB;?></th>
<th class='w-80px<?php echo zget($hasFields, 'pri', ' hidden')?>'> <?php echo $lang->bug->pri;?></th>
<th class='w-80px<?php echo zget($hasFields, 'severity', ' hidden')?>'><?php echo $lang->bug->severity;?></th>
<th class='w-120px<?php echo zget($hasFields, 'os', ' hidden')?>'> <?php echo $lang->bug->os;?></th>
<th class='w-100px<?php echo zget($hasFields, 'browser', ' hidden')?>'><?php echo $lang->bug->browser;?></th>
<th class='<?php echo zget($hasFields, 'keywords', ' hidden')?>'> <?php echo $lang->bug->keywords;?></th>
</tr>
</thead>
<tbody>
@@ -52,6 +61,7 @@
$moduleOptionMenu += array('ditto' => $lang->bug->ditto);
$projects += array('ditto' => $lang->bug->ditto);
$lang->bug->typeList += array('ditto' => $lang->bug->ditto);
$lang->bug->priList += array('ditto' => $lang->bug->ditto);
$lang->bug->osList += array('ditto' => $lang->bug->ditto);
$lang->bug->browserList += array('ditto' => $lang->bug->ditto);
?>
@@ -62,27 +72,23 @@
$moduleID = $i == 0 ? $moduleID : 'ditto';
$projectID = $i == 0 ? $projectID : 'ditto';
$type = $i == 0 ? '' : 'ditto';
$pri = $i == 0 ? 0 : 'ditto';
$os = $i == 0 ? '' : 'ditto';
$browser = $i == 0 ? '' : 'ditto';
?>
<tr class='text-center'>
<td><?php echo $i+1;?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
<td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
<td class='text-left<?php echo zget($hasFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
<td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, 'trunk', "class='form-control chosen' multiple");?></td>
<td><?php echo html::input("title[$i]", $bugTitle, 'class=form-control');?></td>
<td>
<?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?>
</td>
<td><?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
<td><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
<td><?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
<td>
<?php
echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");
echo html::hidden("uploadImage[$i]", $fileName);
?>
</td>
<td><?php echo html::input("title[$i]", $bugTitle, 'class=form-control') . html::hidden("uploadImage[$i]", $fileName);?></td>
<td class='<?php echo zget($hasFields, 'steps', 'hidden')?>'> <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
<td class='<?php echo zget($hasFields, 'type', 'hidden')?>'> <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'> <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'os', 'hidden')?>'> <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', 'class=form-control');?></td>
</tr>
<?php $i++;?>
<?php endforeach;?>
@@ -93,27 +99,28 @@
$moduleID = $i - $nextStart == 0 ? $moduleID : 'ditto';
$projectID = $i - $nextStart == 0 ? $projectID : 'ditto';
$type = $i - $nextStart == 0 ? '' : 'ditto';
$pri = $i - $nextStart == 0 ? 0 : 'ditto';
$os = $i - $nextStart == 0 ? '' : 'ditto';
$browser = $i - $nextStart == 0 ? '' : 'ditto';
?>
<tr class='text-center'>
<td><?php echo $i+1;?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
<td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
<td class='text-left<?php echo zget($hasFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
<td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control chosen' multiple");?></td>
<td><?php echo html::input("title[$i]", '', 'class=form-control');?></td>
<td>
<?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?>
</td>
<td><?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
<td><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
<td><?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
<td><?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'steps', 'hidden')?>'> <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
<td class='<?php echo zget($hasFields, 'type', 'hidden')?>'> <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'> <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'os', 'hidden')?>'> <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', 'class=form-control');?></td>
</tr>
<?php endfor;?>
</tbody>
<tfoot>
<tr><td colspan='8' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
<tr><td colspan='<?php echo count($hasFields) + 3?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
</tfoot>
</table>
</form>
@@ -121,20 +128,22 @@
<tbody>
<tr class='text-center'>
<td>%s</td>
<td class='text-left' style='overflow:visible'><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control' onchange='loadProjectBuilds($productID, this.value, \"%s\")'");?></td>
<td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
<td class='text-left<?php echo zget($hasFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control' onchange='loadProjectBuilds($productID, this.value, \"%s\")'");?></td>
<td class='text-left' style='overflow:visible' id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control' multiple");?></td>
<td><?php echo html::input("titles[%s]", '', 'class=form-control');?></td>
<td>
<?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?>
</td>
<td><?php echo html::select("types[%s]", $lang->bug->typeList, '', "class='form-control'");?></td>
<td><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control'");?></td>
<td><?php echo html::select("oses[%s]", $lang->bug->osList, '', "class='form-control'");?></td>
<td><?php echo html::select("browsers[%s]", $lang->bug->browserList, '', "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'steps', 'hidden')?>'> <?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?></td>
<td class='<?php echo zget($hasFields, 'type', 'hidden')?>'> <?php echo html::select("types[%s]", $lang->bug->typeList, '', "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'> <?php echo html::select("pris[%s]", $lang->bug->priList, '', "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'severity', 'hidden')?>'><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'os', 'hidden')?>'> <?php echo html::select("oses[%s]", $lang->bug->osList, '', "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, '', "class='form-control'");?></td>
<td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[%s]", '', 'class=form-control');?></td>
</tr>
</tbody>
</table>
<?php js::set('branch', $branch)?>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=bug&section=custom&key=batchcreate')?>
<?php include '../../common/view/customfield.html.php';?>
<?php include '../../common/view/pastetext.html.php';?>
<?php include '../../common/view/footer.html.php';?>