Merge branch 'sprint/215_tianshujie_60667' into 'master'

* Fix bug #25070.

See merge request easycorp/zentaopms!4480

module/task/view/create.html.php

@@ -18,12 +18,15 @@
 <?php js::set('teamMemberError', $lang->task->error->teamMember);?>
 <?php js::set('vision', $config->vision);?>
 <?php js::set('requiredFields', $config->task->create->requiredFields);?>
+<?php js::set('estimateNotEmpty', sprintf($lang->error->notempty, $lang->task->estimate))?>
 <?php if(!empty($storyID)):?>
 <style> .title-group.required > .required:after {right: 110px;}</style>
 <?php endif;?>
 <?php
+$requiredFields = array();
 foreach(explode(',', $config->task->create->requiredFields) as $field)
 {
+    if($field) $requiredFields[$field] = '';
     if($field and strpos($showFields, $field) === false) $showFields .= ',' . $field;
 }
 ?>
@@ -283,7 +286,7 @@ foreach(explode(',', $config->task->create->requiredFields) as $field)
                 <tbody class='sortable'>
                   <tr class='template'>
                     <td><?php echo html::select("team[]", $members, '', "class='form-control chosen'");?></td>
-                    <td>
+                    <td class="<?php echo zget($requiredFields, 'estimate', '', ' required')?>">
                       <div class='input-group'>
                         <?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->estimateAB}'") ?>
                         <span class='input-group-addon'><?php echo $lang->task->hour;?></span>