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

* Finish task #4721.

Browse Source
This commit is contained in:
Yagami
2018-09-12 16:52:42 +08:00
parent 518ac856c9
commit c22696976c
5 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/create.css
+1
View File
@@ -34,3 +34,4 @@
.input-group-addon.w-90px{min-width:90px;}
.input-group .input-group-btn .btn{padding: 6px 12px;}
#all{border-left:none}
module/bug/js/common.js
+18 -2
View File
@@ -141,7 +141,14 @@ function loadAllProjectBuilds(projectID, productID)
{
oldOpenedBuild = $('#openedBuild').val() ? $('#openedBuild').val() : 0;
link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch + '&index=0&needCreate=true&type=all');
$('#buildBox').load(link, function(){ notice(); $('#openedBuild').chosen();});
$.get(link, function(data)
{
notice();
if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
$('#openedBuild').replaceWith(data);
$('#openedBuild_chosen').remove();
$("#openedBuild").chosen();
})
}
if(page == 'edit')
{
@@ -172,7 +179,14 @@ function loadAllProductBuilds(productID)
if(page == 'create')
{
link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch + '&index=0&type=all');
$('#buildBox').load(link, function(){ notice(); $('#openedBuild').chosen();});
$.get(link, function(data)
{
notice();
if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
$('#openedBuild').replaceWith(data);
$('#openedBuild_chosen').remove();
$("#openedBuild").chosen();
})
}
if(page == 'edit')
{
@@ -268,6 +282,7 @@ function loadProductBuilds(productID)
if(page == 'create')
{
notice();
$.get(link, function(data)
{
if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
@@ -358,6 +373,7 @@ function loadProjectBuilds(projectID)
if(page == 'create')
{
notice();
link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + "&branch=" + branch + "&index=0&needCreate=true");
$.get(link, function(data)
{
module/bug/view/create.html.php
+1 -1
View File
@@ -95,7 +95,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
<span class="input-group-addon"><?php echo $lang->bug->openedBuild?></span>
<?php echo html::select('openedBuild[]', $builds, $buildID, "size=4 multiple=multiple class='chosen form-control'");?>
<span class='input-group-addon fix-border' id='buildBoxActions'></span>
<div class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' data-toggle='tooltip' onclick='loadAllBuilds()'")?></div>
<div class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' id='all' data-toggle='tooltip' onclick='loadAllBuilds()'")?></div>
</div>
</td>
</tr>
module/testsuite/model.php
-6
View File
@@ -164,12 +164,6 @@ class testsuiteModel extends model
$pageNav .= '<ul class="dropdown-menu">';
if(common::hasPriv('testsuite', 'createLib')) $pageNav .= '<li>' . html::a(helper::createLink('testsuite', 'createLib'), '<i class="icon icon-plus"></i> ' . $this->lang->testsuite->createLib) . '</li>';
$pageNav .= '</ul></div></div>';
if(common::hasPriv('testsuite', 'libView'))
{
$link = helper::createLink('testsuite', 'libView', "libID=$libID");
$pageActions .= html::a($link, "<i class='icon icon-list-alt muted'> </i>" . $this->lang->testsuite->view, '', "class='btn'");
}
}
else
{
module/testsuite/view/library.html.php
+7
View File
@@ -43,6 +43,13 @@ js::set('flow', $config->global->flow);
}
?>
<a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->testcase->bySearch;?></a>
<?php
if(common::hasPriv('testsuite', 'libView'))
{
$link = helper::createLink('testsuite', 'libView', "libID=$libID");
echo html::a($link, "<i class='icon icon-list-alt muted'> </i>" . $this->lang->testsuite->view, '', "class='btn btn-link'");
}
?>
</div>
<div class='btn-toolbar pull-right'>
<div class='btn-group'>