Merge branch '230' into 'sprint/zentaopms230'

* Fix bug #27023.

See merge request easycorp/zentaopms!5221

module/task/model.php

@@ -3838,8 +3838,7 @@ class taskModel extends model
      */
     public function getAssignedTo4Multi($users, $task, $type = 'current')
     {
-        if(empty($task->team)) return $task->assignedTo;
-        if($task->mode != 'linear') return '';
+        if(empty($task->team) or $task->mode != 'linear') return $task->assignedTo;
 
         $teamHours = array_values($task->team);
 

module/task/view/recordestimate.html.php

@@ -89,6 +89,7 @@
         <tbody>
           <?php for($i = 1; $i <= 5; $i++):?>
           <tr class="text-center">
+            <?php echo html::hidden("id[$i]", $i);?>
             <td><?php echo html::input("dates[$i]", helper::today(), "class='form-control text-center form-date'");?></td>
             <td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' rows=1");?></td>
             <td>