Merge branch 'sprint/pailei2_zhouxudong_19990' into 'pailei2'

Sprint/pailei2 zhouxudong 19990

See merge request easycorp/zentaopms!2136

module/task/js/create.js

@@ -550,6 +550,15 @@ $('#modalTeam .btn').click(function()
         $('#teamMember').val(team);
         $('#estimate').val(time);
     })
+    var teamList = team.split(" ");
+    if(teamList.length <= 2)
+    {
+        alert(teamMemberError);
+    }
+    else
+    {
+        $('.close').click();
+    }
 });
 
 $(window).unload(function(){

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 at least 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?';

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        = '当前状态的多人任务不能指派给任务团队外的成员。';

module/task/view/create.html.php

@@ -15,6 +15,7 @@
 <?php include '../../common/view/sortable.html.php';?>
 <?php js::set('toTaskList', !empty($task->id));?>
 <?php js::set('blockID', $blockID);?>
+<?php js::set('teamMemberError', $lang->task->error->teamMember);?>
 <?php if(!empty($storyID)):?>
 <style> .title-group.required > .required:after {right: 110px;}</style>
 <?php endif;?>
@@ -286,7 +287,7 @@
                 </tbody>
                 <tfoot>
                   <tr>
-                    <td colspan='3' class='text-center'><?php echo html::a('javascript:void(0)', $lang->confirm, '', "class='btn btn-primary' data-dismiss='modal'");?></td>
+                    <td colspan='3' class='text-center'><?php echo html::a('javascript:void(0)', $lang->confirm, '', "class='btn btn-primary'");?></td>
                   </tr>
                 </tfoot>
               </table>