From 6ccfbaebef093e605581d2512716c793eb4fe94b Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Wed, 13 Apr 2016 16:54:51 +0800
Subject: [PATCH] * code for task #2546.

---
 module/bug/config.php           |  2 +-
 module/bug/view/create.html.php | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index 4e59a0a0e0..942401f09f 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -38,7 +38,7 @@ $config->bug->list->exportFields = 'id, product, module, project, story, task,
     lastEditedBy,
     lastEditedDate, files';
 
-$config->bug->list->customCreateFields = 'project,story,task,os,browser,mailto,keywords';
+$config->bug->list->customCreateFields = 'project,story,task,pri,severity,os,browser,mailto,keywords';
 
 $config->bug->custom = new stdclass();
 $config->bug->custom->create = $config->bug->list->customCreateFields;
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index dd244f218e..5064a7f929 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -118,8 +118,13 @@ js::set('refresh', $lang->refresh);
                 <?php echo html::input('title', $bugTitle, "class='form-control'");?>
               </div>
             </div>
-            <div class='col-table'>
+            <?php $showSeverity = strpos(",$showFields,", ',severity,') !== false;?>
+            <?php $showPri      = strpos(",$showFields,", ',pri,')      !== false;?>
+            <?php if($showSeverity or $showPri):?>
+            <?php $widthClass = (!$showSeverity or !$showPri) ? 'w-100px' : 'w-230px';?>
+            <div class='col-table <?php echo $widthClass?>'>
               <div class='input-group'>
+                <?php if($showSeverity):?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->bug->severity;?></span>
                 <?php $isAllNumberSeverity = is_numeric(join($lang->bug->severityList));?>
                 <?php if(!$isAllNumberSeverity):?>
@@ -133,6 +138,8 @@ js::set('refresh', $lang->refresh);
                   <?php echo html::select('severity', (array)$lang->bug->severityList, $severity, "class='hide'");?>
                 </div>
                 <?php endif; ?>
+                <?php endif;?>
+                <?php if($showPri):?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->bug->pri;?></span>
                 <?php $isAllNumberPri = is_numeric(join($lang->bug->priList));?>
                 <?php if(!$isAllNumberPri):?>
@@ -145,9 +152,11 @@ js::set('refresh', $lang->refresh);
                   <ul class='dropdown-menu pull-right'></ul>
                   <?php echo html::select('pri', $lang->bug->priList, '', "class='hide'");?>
                 </div>
-                <?php endif; ?>
+                <?php endif;?>
+                <?php endif;?>
               </div>
             </div>
+            <?php endif;?>
           </div>
         </td>
       </tr>