Merge branch 'master' of https://github.com/easysoft/zentaopms

module/task/lang/en.php

@@ -183,6 +183,7 @@ $lang->task->error->left             = 'Please enter "Left Hour"';
 $lang->task->error->work             = '"Remark" must be less than %d characteres.';
 $lang->task->error->skipClose        = 'Task: %s is not “Done” or “Cancelled”. Do you want to close it?';
 $lang->task->error->consumed         = 'Task: %s Hour must be more than 0. Ignore changes to this Task.';
+$lang->task->error->assignedTo       = 'Multiple task in the current state cannot be assigned to member who outside the task team.';
 
 /* Report. */
 $lang->task->report = new stdclass();

module/task/lang/zh-cn.php

@@ -183,6 +183,7 @@ $lang->task->error->left             = '请填写"剩余"';
 $lang->task->error->work             = '"备注"必须小于%d个字符';
 $lang->task->error->skipClose        = '任务：%s 不是“已完成”或“已取消”状态，确定要关闭吗？';
 $lang->task->error->consumed         = '任务：%s工时不能小于0，忽略该任务工时的改动';
+$lang->task->error->assignedTo       = '当前状态的多人任务不能指派给任务团队外的成员。';
 
 /* Report. */
 $lang->task->report         = new stdclass();

module/task/model.php

@@ -581,6 +581,12 @@ class taskModel extends model
         $teams = array();
         if($this->post->multiple)
         {
+            if(strpos(',done,closed,cancel,', ",{$task->status},") === false && !in_array($this->post->assignedTo, $this->post->team))
+            {
+                dao::$errors[] = $this->lang->task->error->assignedTo;
+                return false;
+            }
+
             foreach($this->post->team as $row => $account)
             {
                 if(empty($account) or isset($team[$account])) continue;

module/task/view/assignto.html.php

@@ -15,12 +15,10 @@
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <?php if(!empty($task->team) && $task->assignedTo != $this->app->user->account):?>
-    <div style="padding: 0 50px 0 0">
-      <div class="alert with-icon no-margin">
-        <i class="icon-exclamation-sign"></i>
-        <div class="content">
-          <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->transfer);?></p>
-        </div>
+    <div class="alert with-icon">
+      <i class="icon-exclamation-sign"></i>
+      <div class="content">
+        <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->transfer);?></p>
       </div>
     </div>
     <?php else:?>

module/task/view/pause.html.php

@@ -14,6 +14,14 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
+    <?php if(!empty($task->team) && $task->assignedTo != $this->app->user->account):?>
+    <div class="alert with-icon">
+      <i class="icon-exclamation-sign"></i>
+      <div class="content">
+        <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->pause);?></p>
+      </div>
+    </div>
+    <?php else:?>
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $task->id;?></span>
@@ -40,6 +48,7 @@
     </form>
     <hr class='small' />
     <div class='main'><?php include '../../common/view/action.html.php';?></div>
+    <?php endif;?>
   </div>
 </div>
 <?php include '../../common/view/footer.html.php';?>

module/task/view/recordestimate.html.php

@@ -18,12 +18,10 @@
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <?php if(!empty($task->team) && $task->assignedTo != $this->app->user->account):?>
-    <div style="padding: 0 50px 0 0">
-      <div class="alert with-icon no-margin">
-        <i class="icon-exclamation-sign"></i>
-        <div class="content">
-          <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->logEfforts);?></p>
-        </div>
+    <div class="alert with-icon">
+      <i class="icon-exclamation-sign"></i>
+      <div class="content">
+        <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->logEfforts);?></p>
       </div>
     </div>
     <?php else:?>