Merge branch 'fix_bug_wangxiaomeng_#17253' into 'master'

fix_bug_17253

See merge request easycorp/zentaopms!2959

module/bug/config.php

@@ -39,7 +39,7 @@ $config->bug->list->exportFields = 'id, product, branch, module, project, execut
     lastEditedDate, files';
 if($config->systemMode == 'classic') $config->bug->list->exportFields = str_replace(' project,', '', $config->bug->list->exportFields);
 
-$config->bug->list->customCreateFields      = 'execution,story,task,pri,severity,os,browser,deadline,mailto,keywords';
+$config->bug->list->customCreateFields      = 'execution,noticefeedbackBy,story,task,pri,severity,os,browser,deadline,mailto,keywords';
 $config->bug->list->customBatchCreateFields = 'execution,steps,type,pri,deadline,severity,os,browser,keywords';
 $config->bug->list->customBatchEditFields   = 'type,severity,pri,productplan,assignedTo,deadline,resolvedBy,resolution,os,browser,keywords';
 

module/bug/lang/en.php

@@ -90,6 +90,7 @@ $lang->bug->fromCase         = 'From Case';
 $lang->bug->toCase           = 'To Case';
 $lang->bug->colorTag         = 'Color';
 $lang->bug->fixedRate        = 'Fixed Rate';
+$lang->bug->noticefeedbackBy = 'NoticeFeedbackBy';
 
 /* Method list. */
 $lang->bug->index              = 'Bug Home';

module/bug/lang/zh-cn.php

@@ -90,6 +90,7 @@ $lang->bug->fromCase         = '来源用例';
 $lang->bug->toCase           = '生成用例';
 $lang->bug->colorTag         = '颜色标签';
 $lang->bug->fixedRate        = '修复率';
+$lang->bug->noticefeedbackBy = '通知反馈者';
 
 /* 方法列表。*/
 $lang->bug->index              = '首页';

module/bug/view/create.html.php

@@ -138,6 +138,7 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
               </div>
             </td>
           <?php $showDeadline = strpos(",$showFields,", ',deadline,') !== false;?>
+          <?php $showNoticefeedbackBy = strpos(",$showFields,", ',noticefeedbackBy,') !== false;?>
           <?php if($showDeadline):?>
             <td id='deadlineTd'>
               <div class='input-group'>
@@ -146,6 +147,7 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
               </div>
             </td>
           </tr>
+          <?php if($showNoticefeedbackBy):?>
           <tr>
             <th><nobr><?php echo $lang->bug->feedbackBy;?></nobr></th>
             <td><?php echo html::input('feedbackBy', '', "class='form-control'");?></td>
@@ -156,7 +158,8 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
               </div>
             </td>
           </tr>
-          <?php else:?>
+          <?php endif;?>
+          <?php elseif($showNoticefeedbackBy):?>
             <td>
               <div class='input-group' id='feedback'>
               <span class="input-group-addon"><?php echo $lang->bug->feedbackBy?></span>