From 2317288f0a2877d557d51834ae20374a1c1dc2e8 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Fri, 11 Feb 2022 15:00:19 +0800 Subject: [PATCH 1/6] * Fix bug #19225. --- module/bug/js/common.js | 1 + module/bug/js/create.js | 29 ++++++++++++++++++----------- module/bug/js/edit.js | 27 +++++++++++++++++---------- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/module/bug/js/common.js b/module/bug/js/common.js index 29bae7991f..ea17e4544b 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -281,6 +281,7 @@ function loadProductExecutions(productID, projectID = 0) if(required) $(this).addClass('required'); }); loadProjectBuilds(projectID); + changeExecutionName(projectID); } /** diff --git a/module/bug/js/create.js b/module/bug/js/create.js index 5de34d51f9..cfc8da7392 100644 --- a/module/bug/js/create.js +++ b/module/bug/js/create.js @@ -157,19 +157,26 @@ $(function() return false; } }); - - $('#project').change(function() - { - var projectID = parseInt($(this).val()); - var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID); - projectID ? loadProjectTeamMembers(projectID) : loadExecutionTeamMembers($('#product').val()); - $.post(link, function(executionLang) - { - bugExecution = executionLang; - }) - }); }); +/** + * Ajax change execution name. + * + * @param int $projectID + * @access public + * @return bool + */ +function changeExecutionName(projectID) +{ + if(!projectID) return false; + projectID ? loadProjectTeamMembers(projectID) : loadExecutionTeamMembers($('#product').val()); + var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID); + $.post(link, function(executionLang) + { + $('#executionBox').html(executionLang); + }) +} + $(window).unload(function(){ if(blockID) window.parent.refreshBlock($('#block' + blockID)); }); diff --git a/module/bug/js/edit.js b/module/bug/js/edit.js index 1068899348..efcbdcbdfb 100644 --- a/module/bug/js/edit.js +++ b/module/bug/js/edit.js @@ -19,18 +19,25 @@ $(function() } }); } - - $('#project').change(function() - { - var projectID = $('#project').val(); - var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID); - $.post(link, function(executionLang) - { - $('#executionBox').html(executionLang); - }) - }) }); +/** + * Ajax change execution name. + * + * @param int $projectID + * @access public + * @return bool + */ +function changeExecutionName(projectID) +{ + if(!projectID) return false; + var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID); + $.post(link, function(executionLang) + { + $('#executionBox').html(executionLang); + }) +} + /** * Set duplicate field. * From e45058a89196f23496c1086412ae0c0ba9381ad1 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Fri, 11 Feb 2022 16:20:41 +0800 Subject: [PATCH 2/6] * Fix bug *19255. --- module/bug/js/create.js | 18 ++++++++++++------ module/bug/js/edit.js | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/module/bug/js/create.js b/module/bug/js/create.js index cfc8da7392..9ea6a14136 100644 --- a/module/bug/js/create.js +++ b/module/bug/js/create.js @@ -168,13 +168,19 @@ $(function() */ function changeExecutionName(projectID) { - if(!projectID) return false; - projectID ? loadProjectTeamMembers(projectID) : loadExecutionTeamMembers($('#product').val()); - var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID); - $.post(link, function(executionLang) + if(parseInt(projectID)) { - $('#executionBox').html(executionLang); - }) + loadProjectTeamMembers(projectID); + var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID); + $.post(link, function(executionLang) + { + $('#executionBox').html(executionLang); + }) + } + else + { + loadExecutionTeamMembers($('#product').val()); + } } $(window).unload(function(){ diff --git a/module/bug/js/edit.js b/module/bug/js/edit.js index efcbdcbdfb..8c4f8e2b4e 100644 --- a/module/bug/js/edit.js +++ b/module/bug/js/edit.js @@ -30,7 +30,7 @@ $(function() */ function changeExecutionName(projectID) { - if(!projectID) return false; + if(!parseInt(projectID)) return false; var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID); $.post(link, function(executionLang) { From 741f568164fc4f9daf12103198b6ea14308b7182 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Fri, 11 Feb 2022 16:37:39 +0800 Subject: [PATCH 3/6] * Fix bug #19255. --- module/bug/js/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/js/common.js b/module/bug/js/common.js index ea17e4544b..0be2c315f1 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -279,9 +279,9 @@ function loadProductExecutions(productID, projectID = 0) $(this).find('select').chosen(); if(typeof(bugExecution) == 'string' && systemMode != 'classic') $('#executionIdBox').prepend("" + bugExecution + ""); if(required) $(this).addClass('required'); + changeExecutionName(projectID); }); loadProjectBuilds(projectID); - changeExecutionName(projectID); } /** From 789a1292acfd4a7be2494a27a54c0b2b1be34cc2 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Fri, 11 Feb 2022 16:49:32 +0800 Subject: [PATCH 4/6] * Fix bug #19255. --- module/bug/js/create.js | 2 +- module/bug/js/edit.js | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/module/bug/js/create.js b/module/bug/js/create.js index 9ea6a14136..41493ca022 100644 --- a/module/bug/js/create.js +++ b/module/bug/js/create.js @@ -164,7 +164,7 @@ $(function() * * @param int $projectID * @access public - * @return bool + * @return void */ function changeExecutionName(projectID) { diff --git a/module/bug/js/edit.js b/module/bug/js/edit.js index 8c4f8e2b4e..2e8440f36f 100644 --- a/module/bug/js/edit.js +++ b/module/bug/js/edit.js @@ -26,16 +26,18 @@ $(function() * * @param int $projectID * @access public - * @return bool + * @return void */ function changeExecutionName(projectID) { - if(!parseInt(projectID)) return false; - var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID); - $.post(link, function(executionLang) - { + if(parseInt(projectID)) + { + var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID); + $.post(link, function(executionLang) + { $('#executionBox').html(executionLang); - }) + }) + } } /** From 2b5885943460d907a8b0ff973401598da5d0ca1e Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Fri, 11 Feb 2022 16:54:49 +0800 Subject: [PATCH 5/6] * Code for bug #19255. --- module/bug/js/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/bug/js/edit.js b/module/bug/js/edit.js index 2e8440f36f..47ba1af935 100644 --- a/module/bug/js/edit.js +++ b/module/bug/js/edit.js @@ -35,7 +35,7 @@ function changeExecutionName(projectID) var link = createLink('bug', 'ajaxGetExecutionLang', 'projectID=' + projectID); $.post(link, function(executionLang) { - $('#executionBox').html(executionLang); + $('#executionBox').html(executionLang); }) } } From b7f793a9eb1ba3f903a6cc81a5dd6a2cd6469318 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Fri, 11 Feb 2022 17:09:50 +0800 Subject: [PATCH 6/6] * Code for bug #19255. --- module/bug/js/create.js | 2 +- module/bug/js/edit.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/bug/js/create.js b/module/bug/js/create.js index 41493ca022..710b877545 100644 --- a/module/bug/js/create.js +++ b/module/bug/js/create.js @@ -162,7 +162,7 @@ $(function() /** * Ajax change execution name. * - * @param int $projectID + * @param int $projectID * @access public * @return void */ diff --git a/module/bug/js/edit.js b/module/bug/js/edit.js index 47ba1af935..418c963d90 100644 --- a/module/bug/js/edit.js +++ b/module/bug/js/edit.js @@ -24,7 +24,7 @@ $(function() /** * Ajax change execution name. * - * @param int $projectID + * @param int projectID * @access public * @return void */