From 7959557283713b92b5b3664dcf0ad00672cd209b Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Wed, 19 Oct 2022 11:05:35 +0800 Subject: [PATCH 01/19] * Fix bug #28647. --- module/tree/view/browse.html.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 84a5815426..daec520156 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -330,6 +330,11 @@ $(function() $('#subNavbar > ul > li > a[href*=tree][href*=browse]').not('[href*=]').parent().removeClass('active'); if(window.config.viewType == 'line') $('#modulemenu > .nav > li > a[href*=product][href*=all]').parent('li[data-id=all]').addClass('active'); if(viewType == 'case' || viewType == 'caselib') $('#subNavbar li[data-id="' + viewType +'"]').addClass('active'); + if(viewType == 'ticket') + { + $('#navbar li[data-id="browse"]').removeClass('active'); + $('#navbar li[data-id="' + viewType +'"]').addClass('active'); + } }); if("") parent.$('#triggerModal .modal-content .modal-header .close').on('click', function(){parent.location.reload();}); From 68f702d9ef53a902075ec3353871983ea1a18ede Mon Sep 17 00:00:00 2001 From: wangzemei Date: Wed, 19 Oct 2022 11:07:04 +0800 Subject: [PATCH 02/19] * fix 28395 28640 28406 --- module/my/js/requirement.js | 1 + module/my/view/requirement.html.php | 5 +++-- module/product/css/browse.css | 1 + module/project/view/bug.html.php | 1 + module/task/css/common.css | 3 +-- module/task/css/create.css | 2 +- www/js/my.full.js | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/module/my/js/requirement.js b/module/my/js/requirement.js index 65996d23e9..7ce09255ea 100644 --- a/module/my/js/requirement.js +++ b/module/my/js/requirement.js @@ -7,6 +7,7 @@ $(function() if($td.find('.label').length > 0) labelWidth = $td.find('.label').width(); $td.find('a').eq(0).css('max-width', $td.width() - labelWidth - 60); }); + toggleFold('#myStoryForm', [], 0, 'requirement'); $(document).on('click', '.story-toggle', function(e) { diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php index 4072cb4d9f..449c7ef409 100644 --- a/module/my/view/requirement.html.php +++ b/module/my/view/requirement.html.php @@ -11,6 +11,7 @@ */ ?> + recTotal);?> rawMethod);?> @@ -79,7 +80,7 @@ $canBeChanged = common::canBeChanged('story', $story); $spanClass = $canBatchAction ? 'c-span' : ''; ?> - +
@@ -91,7 +92,7 @@ title, null, "style='color: $story->color' data-group='product' title='$story->title'") : "$story->title";?> - children)) echo '';?> + children)) echo '';?> pri;?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> processStatus('story', $story);?> diff --git a/module/product/css/browse.css b/module/product/css/browse.css index 687cadd585..dd98a82845 100644 --- a/module/product/css/browse.css +++ b/module/product/css/browse.css @@ -41,3 +41,4 @@ a.removeModule:hover {color: red;} #productStoryForm tbody tr td .label {max-width: 100px; text-overflow: unset;} .c-span {margin-left: 19px;} .btn-toolbar #query span.text{overflow: hidden; width: 52px; vertical-align: middle; margin-right: 1px;} +#productStoryForm table thead th.c-title {min-width: 50px;} diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index 545084f854..26d7033472 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -17,6 +17,7 @@ #subHeader #dropMenu .col-left {padding-bottom: 0px;} #currentBranch + #dropMenu .col-left {padding-bottom: 30px;} .c-deadline {text-align: center;} +#mainContent .main-col {padding-bottom: 20px;}