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

* adjust for only test.

Browse Source
This commit is contained in:
wangyidong
2018-05-18 10:27:06 +08:00
parent 66cf0a2572
commit bb7b76e803
5 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/js/browse.js
+9 -11
View File
@@ -1,36 +1,34 @@
$(document).ready(function()
$(function()
{
if(browseType == 'bysearch') ajaxGetSearchForm();
if($('#bugList thead th.w-title').width() < 150) $('#bugList thead th.w-title').width(150);
if(flow == 'onlyTest')
{
$('#modulemenu > .nav').append($('#featurebar > .submenu').html());
toggleSearch();
$(".export").modalTrigger({width:650, type:'iframe'});
$('#modulemenu > .nav > li').removeClass('active');
$('#modulemenu > .nav > li[data-id=' + browseType + ']').addClass('active');
$('#subNavbar > .nav > li').removeClass('active');
$('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
var navWidth = $('#modulemenu > .nav').width();
var navWidth = $('#subNavbar > .nav').width();
var leftWidth = 0;
var rightWidth = 0;
$rightNav = $('#modulemenu > .nav > li.right');
$rightNav = $('#subNavbar > .nav > li.right');
rightLength = $rightNav.length;
for(i = 0; i < rightLength; i++) rightWidth += $rightNav.eq(i).width();
var maxWidth = navWidth - $('#modulemenu > .nav > #bysearchTab').width() - rightWidth - 100;
var maxWidth = navWidth - $('#subNavbar > .nav > #bysearchTab').width() - rightWidth - 100;
$('#modulemenu > .nav > li:not(.right)').each(function()
$('#subNavbar > .nav > li:not(.right)').each(function()
{
if(leftWidth > maxWidth)
{
if($(this).attr('id') != 'moreMenus' && $(this).attr('id') != 'bysearchTab')
{
$('#moreMenus').removeClass('hidden');
$('#moreMenus > ul').append($(this)[0]);
$('#subNavbar').removeClass('hidden');
$('#subNavbar > ul').append($(this)[0]);
}
}
else
module/common/lang/en.php
+1 -1
View File
@@ -244,7 +244,7 @@ $lang->project->subMenu->list->tree = 'Tree View|project|tree|projectID=%s'
$lang->project->subMenu->qa = new stdclass();
$lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s';
$lang->project->subMenu->qa->build = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build');
$lang->project->subMenu->qa->testtask = array('link' => 'Test Task|project|testtask|projectID=%s', 'subModule' => 'testreport');
$lang->project->subMenu->qa->testtask = array('link' => 'Test Task|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
$lang->project->subMenu->action = new stdclass();
$lang->project->subMenu->action->dynamic = 'Dynamic|project|dynamic|projectID=%s';
module/common/lang/zh-cn.php
+1 -1
View File
@@ -244,7 +244,7 @@ $lang->project->subMenu->list->tree = '树状图|project|tree|projectID=%s'
$lang->project->subMenu->qa = new stdclass();
$lang->project->subMenu->qa->bug = 'Bug|project|bug|projectID=%s';
$lang->project->subMenu->qa->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build');
$lang->project->subMenu->qa->testtask = array('link' => '测试单|project|testtask|projectID=%s', 'subModule' => 'testreport');
$lang->project->subMenu->qa->testtask = array('link' => '测试单|project|testtask|projectID=%s', 'subModule' => 'testreport,testtask');
$lang->project->subMenu->action = new stdclass();
$lang->project->subMenu->action->dynamic = '动态|project|dynamic|projectID=%s';
module/testcase/js/browse.js
+3 -5
View File
@@ -21,20 +21,18 @@ function confirmBatchDelete(actionLink)
return false;
}
$(document).ready(function()
$(function()
{
if(browseType == 'bysearch') ajaxGetSearchForm();
if($('#caseList thead th.w-title').width() < 150) $('#caseList thead th.w-title').width(150);
if(flow == 'onlyTest')
{
$('#modulemenu > .nav').append($('#mainMenu > .pull-left.btn-toolbar').html());
toggleSearch();
$('.export').modalTrigger({width:650, type:'iframe', afterShown: setCheckedCookie})
$('#modulemenu > .nav > li').removeClass('active');
$('#modulemenu > .nav > li[data-id=' + browseType + ']').addClass('active');
$('#subNavbar > .nav > li').removeClass('active');
$('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
}
});
module/tree/view/ajaxgetdropmenu.html.php
+5
View File
@@ -6,6 +6,11 @@
<?php
foreach($modules as $moduleID => $module)
{
if(empty($module))
{
$module = '/';
$modulesPinyin[$module] = '';
}
echo html::a(sprintf($link, $productID, $moduleID), $module, '', "data-key='{$modulesPinyin[$module]}'");
}
?>