From 6917f1219326b5ebf461e454d810b461a1892cf8 Mon Sep 17 00:00:00 2001 From: zenggang Date: Wed, 4 Aug 2021 18:25:45 +0800 Subject: [PATCH 1/5] * Finish task #40889 --- config/filter.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/filter.php b/config/filter.php index 6d968118ea..6991db445d 100644 --- a/config/filter.php +++ b/config/filter.php @@ -215,6 +215,12 @@ $filter->story->export->cookie['checkedItem'] = 'reg::checked'; $filter->task->create->cookie['lastTaskModule'] = 'int'; $filter->task->export->cookie['checkedItem'] = 'reg::checked'; +$filter->execution->story->cookie['storyPreExecutionID'] = 'int'; +$filter->execution->story->cookie['storyModuleParam'] = 'int'; +$filter->execution->story->cookie['storyProductParam'] = 'int'; +$filter->execution->story->cookie['storyBranchParam'] = 'int'; +$filter->execution->story->cookie['executionStoryOrder'] = 'code'; + $filter->testcase->browse->cookie['caseModule'] = 'int'; $filter->testcase->browse->cookie['caseSuite'] = 'int'; $filter->testcase->browse->cookie['preBranch'] = 'int'; From 8ffdf25334afdd814def201411f24827f3b4a351 Mon Sep 17 00:00:00 2001 From: holan20180123 Date: Thu, 5 Aug 2021 08:29:45 +0800 Subject: [PATCH 2/5] * Fix bug #14065. --- module/block/view/dashboard.html.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 484f5d26dc..2603308dcb 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -121,7 +121,6 @@ $(function() custom: response.data.content, width: 600 }); - myModalTrigger.show(); $('#showAnnual').click(function(){myModalTrigger.close()}); }); } From 831b9b586cc488b1edfa741cddc25cf016e29f20 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 5 Aug 2021 09:46:10 +0800 Subject: [PATCH 3/5] * Fix the problem of selecting all when merging by product. --- module/upgrade/js/mergeprogram.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js index 7ec141c5d3..f84d05390b 100644 --- a/module/upgrade/js/mergeprogram.js +++ b/module/upgrade/js/mergeprogram.js @@ -158,6 +158,7 @@ $(function() /* Select all product events. */ $('#checkAllProducts').click(function() { + var lineID = $('li.currentPage').attr('lineid'); var checked = true; if($(this).is(':checked')) @@ -189,6 +190,18 @@ $(function() { $('[name^=products]').prop('checked', checked); $('[name^=sprints]').prop('checked', checked); + + if(checked) + { + $('[name^=products]').each(function() + { + if($(this).prop('checked')) + { + setProgramByProduct($(this)); + return false; + } + }) + } } var checkAllLines = isSelectAll(0, 'line'); @@ -225,6 +238,18 @@ $(function() { $('[name^=products]').prop('checked', checked); $('[name^=sprints]').prop('checked', checked); + + if(checked) + { + $('[name^=products]').each(function() + { + if($(this).prop('checked')) + { + setProgramByProduct($(this)); + return false; + } + }) + } } var checkAllLines = isSelectAll(0, 'line'); From 206af620269a0ef2277f0cd1675b3c0265787177 Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Thu, 5 Aug 2021 09:52:45 +0800 Subject: [PATCH 4/5] * Init before using it. --- config/filter.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/filter.php b/config/filter.php index 6991db445d..0b6aa26736 100644 --- a/config/filter.php +++ b/config/filter.php @@ -36,6 +36,7 @@ $filter->branch = new stdclass(); $filter->qa = new stdclass(); $filter->story = new stdclass(); $filter->task = new stdclass(); +$filter->execution = new stdclass(); $filter->testcase = new stdclass(); $filter->program = new stdclass(); $filter->project = new stdclass(); From b8a31398c918533e964ce740deb6b28870531851 Mon Sep 17 00:00:00 2001 From: Hao Sun Date: Thu, 5 Aug 2021 10:05:19 +0800 Subject: [PATCH 5/5] * fix icon style in table. --- module/common/view/sortable.html.php | 1 - www/theme/blue/style.css | 4 ++-- www/theme/zui/css/min.css | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/module/common/view/sortable.html.php b/module/common/view/sortable.html.php index ed8b9a1183..45f3f38175 100644 --- a/module/common/view/sortable.html.php +++ b/module/common/view/sortable.html.php @@ -2,7 +2,6 @@