From 7c46d9c61db90516ae53427a5220203e234447c7 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 25 Mar 2022 12:51:59 +0800 Subject: [PATCH] * Fix bug #17291. --- module/project/js/common.js | 15 +++++++++++++++ module/project/lang/en.php | 1 + module/project/lang/zh-cn.php | 1 + module/project/view/create.html.php | 1 + module/project/view/edit.html.php | 1 + 5 files changed, 19 insertions(+) diff --git a/module/project/js/common.js b/module/project/js/common.js index 48aa7f8f1d..c83b42b3e0 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -309,3 +309,18 @@ function setBudgetTipsAndAclList(programID) $('.aclBox').html($('#PGMAcl').html()); } } + +$(document).on('change', "#plansBox select[name^='plans']", function() +{ + var $plan = $(this); + $("#plansBox select[name^='plans']").each(function() + { + if($plan.val() != 0 && $plan.val() == $(this).val() && $plan.closest('div').attr('id') != $(this).closest('div').attr('id')) + { + bootbox.alert(errorSamePlans); + $plan.val(0); + $plan.trigger("chosen:updated"); + return false; + } + }); +}); diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 74d15684ad..6b7dc30d31 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -44,6 +44,7 @@ $lang->project->manageProducts = 'Manage Products'; $lang->project->copyTitle = 'Please select an project to copy'; $lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.'; $lang->project->errorSameBranches = 'Project cannot be associated with multiple identical branches.'; +$lang->project->errorSamePlans = 'Project cannot be associated with multiple identical plans.'; $lang->project->errorNoProducts = 'At least one product is associated'; $lang->project->copyNoProject = 'There are no items available to copy.'; $lang->project->searchByName = 'Enter the project name to retrieve'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index b73ddad11a..b4188b6d1a 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -44,6 +44,7 @@ $lang->project->manageProducts = '关联产品'; $lang->project->copyTitle = '请选择要复制的项目'; $lang->project->errorSameProducts = '项目不能关联多个相同的产品。'; $lang->project->errorSameBranches = '项目不能关联多个相同的分支。'; +$lang->project->errorSamePlans = '项目不能关联多个相同的计划。'; $lang->project->errorNoProducts = '最少关联一个产品'; $lang->project->copyNoProject = '没有可用的项目来复制'; $lang->project->searchByName = '输入项目名称进行检索'; diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 2cb1c3cc66..e9a9753a2d 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -19,6 +19,7 @@ execution->weekend);?> project->errorSameProducts);?> project->errorSameBranches);?> +project->errorSamePlans);?> project->longTime);?> diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index 460a2b7bef..a87819b88c 100644 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -16,6 +16,7 @@ execution->weekend);?> project->errorSameProducts);?> project->errorSameBranches);?> +project->errorSamePlans);?> parent);?> id);?> project->longTime);?>