From ca901e8364726017e9e27f6ba99ddcc7f5336f1d Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Tue, 8 Mar 2022 10:21:41 +0800 Subject: [PATCH] * Fix bug #19990. --- module/task/js/create.js | 11 ++++++++++- module/task/lang/en.php | 1 + module/task/lang/zh-cn.php | 1 + module/task/view/create.html.php | 3 ++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/module/task/js/create.js b/module/task/js/create.js index 691e4817e5..1b901fbf7e 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -546,10 +546,19 @@ $('#modalTeam .btn').click(function() { time += estimate; } - + $('#teamMember').val(team); $('#estimate').val(time); }) + var a = team.split(" "); + if(a.length <= 2) + { + alert(teamMember); + } + else + { + $('.close').click(); + } }); $(window).unload(function(){ diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 75a1df49ca..5b19806fcf 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -232,6 +232,7 @@ $lang->task->error->leftNumber = '"Left" must be numbers.'; $lang->task->error->recordMinus = 'Work hours should not be negative number.'; $lang->task->error->consumedSmall = '"Total Cost" must be > the last number.'; $lang->task->error->consumedThisTime = 'Please enter "Hours Cost"'; +$lang->task->error->teamMember = 'Team members must be no less than 2 people'; $lang->task->error->left = 'Please enter "Hours Left"'; $lang->task->error->work = '"Comment" must be < %d characters.'; $lang->task->error->skipClose = 'Task: %s is not “Finished” or “Cancelled”. Do you want to close it?'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 3b669129b4..8f7f05cecd 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -234,6 +234,7 @@ $lang->task->error->consumedSmall = '"总计消耗"必须大于之前消耗' $lang->task->error->consumedThisTime = '请填写"工时"'; $lang->task->error->left = '请填写"剩余"'; $lang->task->error->work = '"备注"必须小于%d个字符'; +$lang->task->error->teamMember = '团队成员必须不少于2人'; $lang->task->error->skipClose = '任务:%s 不是“已完成”或“已取消”状态,确定要关闭吗?'; $lang->task->error->consumed = '任务:%s工时不能小于0,忽略该任务工时的改动'; $lang->task->error->assignedTo = '当前状态的多人任务不能指派给任务团队外的成员。'; diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index d269a0193a..2f2751a2e5 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -15,6 +15,7 @@ id));?> +task->error->teamMember);?> @@ -286,7 +287,7 @@ - confirm, '', "class='btn btn-primary' data-dismiss='modal'");?> + confirm, '', "class='btn btn-primary'");?>