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

* finish task #2386,2402.

Browse Source
This commit is contained in:
wangyidong
2015-11-11 13:29:55 +08:00
parent fcadcec130
commit a9d90a73c9
6 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/bug/js/common.js
View File

@@ -181,7 +181,11 @@ function loadProductModules(productID)
branch = $('#branch').val();
if(typeof(branch) == 'undefined') branch = 0;
link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&branch=' + branch + '&rootModuleID=0&returnType=html&needManage=true');
$('#moduleIdBox').load(link, function(){$(this).find('select').chosen(defaultChosenOptions)});
$('#moduleIdBox').load(link, function()
{
$(this).find('select').chosen(defaultChosenOptions)
if(typeof(bugModule) == 'string') $('#moduleIdBox').prepend("<span class='input-group-addon'>" + bugModule + "</span>")
});
}
/**
@@ -372,7 +376,7 @@ function loadProductBranches(productID)
if(data)
{
$('#product').closest('.input-group').append(data);
$('#branch').css('width', page == 'create' ? '100px' : '65px');
$('#branch').css('width', page == 'create' ? '120px' : '65px');
}
})
}

6
module/bug/view/create.html.php
View File

@@ -30,15 +30,16 @@ js::set('refresh', $lang->refresh);
<form class='form-condensed' method='post' enctype='multipart/form-data' id='dataform' data-type='ajax'>
<table class='table table-form'>
<tr>
<th class='w-110px'><?php echo $lang->bug->lblProductAndModule;?></th>
<th class='w-110px'><?php echo $lang->bug->product;?></th>
<td class='w-p45-f'>
<div class='input-group'>
<?php echo html::select('product', $products, $productID, "onchange='loadAll(this.value);' class='form-control chosen' autocomplete='off'");?>
<?php if($this->session->currentProductType != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch()' class='form-control' style='width:100px'");?>
<?php if($this->session->currentProductType != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch()' class='form-control' style='width:120px'");?>
</div>
</td>
<td>
<div class='input-group' id='moduleIdBox'>
<span class="input-group-addon"><?php echo $lang->bug->module?></span>
<?php
echo html::select('module', $moduleOptionMenu, $moduleID, "onchange='loadModuleRelated()' class='form-control chosen'");
if(count($moduleOptionMenu) == 1)
@@ -181,4 +182,5 @@ js::set('refresh', $lang->refresh);
</table>
</form>
</div>
<?php js::set('bugModule', $lang->bug->module);?>
<?php include '../../common/view/footer.html.php';?>

18
module/story/view/create.html.php
View File

@@ -24,13 +24,13 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->story->product;?></th>
<td class='w-p25-f'>
<td class='w-p45-f'>
<div class='input-group'>
<?php echo html::select('product', $products, $productID, "onchange='loadProduct(this.value);' class='form-control chosen'");?>
<?php if($product->type != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control' style='width:65px'");?>
<?php if($product->type != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control' style='width:120px'");?>
</div>
</td>
<td class='w-p25-f'>
<td>
<div class='input-group' id='moduleIdBox'>
<span class='input-group-addon'><?php echo $lang->story->module;?></span>
<?php
@@ -82,7 +82,7 @@
</tr>
<tr>
<th><?php echo $lang->story->title;?></th>
<td colspan='3'>
<td colspan='2'>
<div class='row'>
<div class='col-sm-8'>
<?php echo html::input('title', $storyTitle, "class='form-control'");?>
@@ -104,15 +104,15 @@
</tr>
<tr>
<th><?php echo $lang->story->spec;?></th>
<td colspan='3'><?php echo html::textarea('spec', $spec, "rows='9' class='form-control'");?><div class='help-block'><?php echo $lang->story->specTemplate;?></div></td>
<td colspan='2'><?php echo html::textarea('spec', $spec, "rows='9' class='form-control'");?><div class='help-block'><?php echo $lang->story->specTemplate;?></div></td>
</tr>
<tr>
<th><?php echo $lang->story->verify;?></th>
<td colspan='3'><?php echo html::textarea('verify', $verify, "rows='6' class='form-control'");?></td>
<td colspan='2'><?php echo html::textarea('verify', $verify, "rows='6' class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->story->mailto;?></th>
<td colspan='2'>
<td>
<div class='input-group'>
<?php
echo html::select('mailto[]', $users, str_replace(' ' , '', $mailto), "multiple");
@@ -138,9 +138,9 @@
</tr>
<tr>
<th><?php echo $lang->story->legendAttatch;?></th>
<td colspan='3'><?php echo $this->fetch('file', 'buildform');?></td>
<td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
</tr>
<tr><td></td><td colspan='3' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
<tr><td></td><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
</table>
<span id='responser'></span>
</form>

2
module/story/view/header.html.php
View File

@@ -24,7 +24,7 @@ function loadProductBranches(productID)
if(data)
{
$('#product').closest('.input-group').append(data);
$('#branch').css('width', '65px');
$('#branch').css('width', config.currentMethod == 'create' ? '120px' : '65px');
}
})
}

8
module/testcase/js/common.js
View File

@@ -42,7 +42,7 @@ function loadProductBranches(productID)
if(data)
{
$('#product').closest('.input-group').append(data);
$('#branch').css('width', '65px');
$('#branch').css('width', config.currentMethod == 'create' ? '120px' : '65px');
}
})
}
@@ -70,7 +70,11 @@ function loadProductModules(productID, branch)
if(typeof(branch) == 'undefined') branch = 0;
if(!branch) branch = 0;
link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=case&branch=' + branch + '&rootModuleID=0&returnType=html&needManage=true');
$('#moduleIdBox').load(link, function(){$(this).find('select').chosen(defaultChosenOptions)});
$('#moduleIdBox').load(link, function()
{
$(this).find('select').chosen(defaultChosenOptions)
if(typeof(caseModule) == 'string') $('#moduleIdBox').prepend("<span class='input-group-addon'>" + caseModule + "</span>")
});
setStories();
}

25
module/testcase/view/create.html.php
View File

@@ -25,15 +25,16 @@
<form class='form-condensed' method='post' enctype='multipart/form-data' id='dataform' data-type='ajax'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->testcase->lblProductAndModule;?></th>
<td class='w-p25-f'>
<th class='w-80px'><?php echo $lang->testcase->product;?></th>
<td class='w-p45-f'>
<div class='input-group'>
<?php echo html::select('product', $products, $productID, "onchange='loadAll(this.value);' class='form-control chosen'");?>
<?php if($this->session->currentProductType != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control' style='width:65px'");?>
<?php if($this->session->currentProductType != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control' style='width:120px'");?>
</div>
</td>
<td class='w-p25-f' style='padding-left:15px'>
<td style='padding-left:15px;'>
<div class='input-group' id='moduleIdBox'>
<span class="input-group-addon"><?php echo $lang->testcase->module?></span>
<?php
echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated();' class='form-control chosen'");
if(count($moduleOptionMenu) == 1)
@@ -60,7 +61,7 @@
</tr>
<tr>
<th><?php echo $lang->testcase->lblStory;?></th>
<td colspan='3'>
<td colspan='2'>
<div class='input-group' id='storyIdBox'>
<?php echo html::select('story', $stories, $storyID, 'class="form-control chosen" onchange="setPreview();" data-no_results_text="' . $lang->searchMore . '"');?>
<span class='input-group-btn' style='width: 0.01%'>
@@ -75,7 +76,7 @@
</tr>
<tr>
<th><?php echo $lang->testcase->title;?></th>
<td colspan='3'>
<td colspan='2'>
<div class='row'>
<div class='col-sm-10'>
<?php echo html::input('title', $caseTitle, "class='form-control'");?>
@@ -91,11 +92,11 @@
</tr>
<tr>
<th><?php echo $lang->testcase->precondition;?></th>
<td colspan='3'><?php echo html::textarea('precondition', $precondition, " rows='2' class='form-control'");?></td>
<td colspan='2'><?php echo html::textarea('precondition', $precondition, " rows='2' class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->testcase->steps;?></th>
<td colspan='3'>
<td colspan='2'>
<table class='table table-form mg-0' style='border: 1px solid #ddd'>
<thead>
<tr>
@@ -126,14 +127,15 @@
</tr>
<tr>
<th><?php echo $lang->testcase->keywords;?></th>
<td colspan='3'><?php echo html::input('keywords', $keywords, "class='form-control'");?></td>
<td colspan='2'><?php echo html::input('keywords', $keywords, "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->testcase->files;?></th>
<td colspan='3'><?php echo $this->fetch('file', 'buildform');?></td>
<td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
</tr>
<tr>
<td colspan='4' class='text-center'><?php echo html::submitButton() . html::backButton();?> </td>
<th></th>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?> </td>
</tr>
</table>
</form>
@@ -154,4 +156,5 @@
</div>
</div>
</div>
<?php js::set('caseModule', $lang->testcase->module)?>
<?php include '../../common/view/footer.html.php';?>