From d80aa64136c7959bac10b25e13df40f23810a350 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Thu, 14 Apr 2016 09:14:31 +0800
Subject: [PATCH] * finish task #2539.

---
 module/bug/config.php                |  6 +-
 module/bug/control.php               |  5 ++
 module/bug/model.php                 |  5 ++
 module/bug/view/batchcreate.html.php | 95 +++++++++++++++-------------
 4 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index 942401f09f..9785852d0a 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -38,10 +38,12 @@ $config->bug->list->exportFields = 'id, product, module, project, story, task,
     lastEditedBy,
     lastEditedDate, files';
 
-$config->bug->list->customCreateFields = 'project,story,task,pri,severity,os,browser,mailto,keywords';
+$config->bug->list->customCreateFields      = 'project,story,task,pri,severity,os,browser,mailto,keywords';
+$config->bug->list->customBatchCreateFields = 'module,project,os,browser,severity,pri,type,steps,keywords';
 
 $config->bug->custom = new stdclass();
-$config->bug->custom->create = $config->bug->list->customCreateFields;
+$config->bug->custom->create      = $config->bug->list->customCreateFields;
+$config->bug->custom->batchcreate = $config->bug->list->customBatchCreateFields;
 
 $config->bug->editor = new stdclass();
 $config->bug->editor->create     = array('id' => 'steps', 'tools' => 'bugTools');
diff --git a/module/bug/control.php b/module/bug/control.php
index 68829c2bf7..0e76561db2 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -385,6 +385,11 @@ class bug extends control
             $this->view->titles = $titles;
         }
 
+        /* Set custom. */
+        foreach(explode(',', $this->config->bug->list->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->bug->$field;
+        $this->view->customFields = $customFields;
+        $this->view->showFields   = $this->config->bug->custom->batchcreate;
+
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->bug->batchCreate;
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID&branch=$branch"), $this->products[$productID]);
         $this->view->position[] = $this->lang->bug->batchCreate;
diff --git a/module/bug/model.php b/module/bug/model.php
index 7c98897c05..1efd3618ee 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -102,6 +102,7 @@ class bugModel extends model
         $module  = 0;
         $project = 0;
         $type    = '';
+        $pri     = 0;
         $os      = '';
         $browser = '';
         for($i = 0; $i < $batchNum; $i++)
@@ -109,12 +110,14 @@ class bugModel extends model
             if($data->modules[$i]  != 'ditto') $module  = (int)$data->modules[$i];
             if($data->projects[$i] != 'ditto') $project = (int)$data->projects[$i];
             if($data->types[$i]    != 'ditto') $type    = $data->types[$i];
+            if($data->pris[$i]     != 'ditto') $pri     = $data->pris[$i];
             if($data->oses[$i]     != 'ditto') $os      = $data->oses[$i];
             if($data->browsers[$i] != 'ditto') $browser = $data->browsers[$i];
 
             $data->modules[$i]  = (int)$module;
             $data->projects[$i] = (int)$project;
             $data->types[$i]    = $type;
+            $data->pris[$i]     = $pri;
             $data->oses[$i]     = $os;
             $data->browsers[$i] = $browser;
         }
@@ -135,9 +138,11 @@ class bugModel extends model
             $bug->title       = $data->title[$i];
             $bug->steps       = nl2br($data->stepses[$i]);
             $bug->type        = $data->types[$i];
+            $bug->pri         = $data->pris[$i];
             $bug->severity    = $data->severities[$i];
             $bug->os          = $data->oses[$i];
             $bug->browser     = $data->browsers[$i];
+            $bug->keywords    = $data->keywords[$i];
 
             if(!empty($data->uploadImage[$i]))
             {
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 826ad893ed..7973eb8936 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -22,24 +22,33 @@
     <div class='actions'>
       <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=bug&params=' . helper::safe64Encode("productID=$productID&projectID=$projectID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn' data-width='600px'")?>
       <?php echo html::commonButton($lang->pasteText, "data-toggle='myModal'")?>
+      <button type="button" class="btn btn-default" data-toggle="customModal"><i class='icon icon-cog'></i> </button>
     </div>
   </div>
 </div>
-
+<?php
+$hasFields = array();
+foreach(explode(',', $showFields) as $field)
+{
+    if($field) $hasFields[$field] = '';
+}
+?>
 <form class='form-condensed' class='form-condensed' method='post' target='hiddenwin'>
   <table class='table table-fixed table-form'>
     <thead>
       <tr>
         <th class='w-50px'>  <?php echo $lang->idAB;?></th> 
-        <th class='w-120px'> <?php echo $lang->bug->module;?></th>
-        <th class='w-130px'> <?php echo $lang->bug->project;?></th>
-        <th class='w-150px'><?php echo $lang->bug->openedBuild;?> <span class='required'></span></th>
+        <th class='w-120px<?php echo zget($hasFields, 'module', ' hidden')?>'> <?php echo $lang->bug->module;?></th>
+        <th class='w-130px<?php echo zget($hasFields, 'project', ' hidden')?>'><?php echo $lang->bug->project;?></th>
+        <th><?php echo $lang->bug->openedBuild;?> <span class='required'></span></th>
         <th><?php echo $lang->bug->title;?> <span class='required'></span></th>
-        <th>                 <?php echo $lang->bug->steps;?></th>
-        <th class='w-100px'> <?php echo $lang->typeAB;?></th>
-        <th class='w-80px'>  <?php echo $lang->bug->severity;?></th>
-        <th class='w-120px'> <?php echo $lang->bug->os;?></th>
-        <th class='w-100px'> <?php echo $lang->bug->browser;?></th>
+        <th class='<?php echo zget($hasFields, 'steps', 'hidden')?>'>          <?php echo $lang->bug->steps;?></th>
+        <th class='w-100px<?php echo zget($hasFields, 'type', ' hidden')?>'>   <?php echo $lang->typeAB;?></th>
+        <th class='w-80px<?php echo zget($hasFields, 'pri', ' hidden')?>'>     <?php echo $lang->bug->pri;?></th>
+        <th class='w-80px<?php echo zget($hasFields, 'severity', ' hidden')?>'><?php echo $lang->bug->severity;?></th>
+        <th class='w-120px<?php echo zget($hasFields, 'os', ' hidden')?>'>     <?php echo $lang->bug->os;?></th>
+        <th class='w-100px<?php echo zget($hasFields, 'browser', ' hidden')?>'><?php echo $lang->bug->browser;?></th>
+        <th class='<?php echo zget($hasFields, 'keywords', ' hidden')?>'>      <?php echo $lang->bug->keywords;?></th>
       </tr>
     </thead>
     <tbody>
@@ -52,6 +61,7 @@
       $moduleOptionMenu       += array('ditto' => $lang->bug->ditto);
       $projects               += array('ditto' => $lang->bug->ditto);
       $lang->bug->typeList    += array('ditto' => $lang->bug->ditto);
+      $lang->bug->priList     += array('ditto' => $lang->bug->ditto);
       $lang->bug->osList      += array('ditto' => $lang->bug->ditto);
       $lang->bug->browserList += array('ditto' => $lang->bug->ditto);
       ?>
@@ -62,27 +72,23 @@
       $moduleID  = $i == 0 ? $moduleID  : 'ditto';
       $projectID = $i == 0 ? $projectID  : 'ditto';
       $type      = $i == 0 ? '' : 'ditto';
+      $pri       = $i == 0 ? 0  : 'ditto';
       $os        = $i == 0 ? '' : 'ditto';
       $browser   = $i == 0 ? '' : 'ditto';
       ?>
       <tr class='text-center'>
         <td><?php echo $i+1;?></td>
-        <td class='text-left' style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
-        <td class='text-left' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
+        <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
+        <td class='text-left<?php echo zget($hasFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
         <td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, 'trunk', "class='form-control chosen' multiple");?></td>
-        <td><?php echo html::input("title[$i]", $bugTitle, 'class=form-control');?></td>
-        <td>
-          <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?>
-        </td>
-        <td><?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
-        <td><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
-        <td><?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
-        <td>
-          <?php
-          echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");
-          echo html::hidden("uploadImage[$i]", $fileName);
-          ?>
-        </td>
+        <td><?php echo html::input("title[$i]", $bugTitle, 'class=form-control') . html::hidden("uploadImage[$i]", $fileName);?></td>
+        <td class='<?php echo zget($hasFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
+        <td class='<?php echo zget($hasFields, 'type', 'hidden')?>'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
+        <td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
+        <td class='<?php echo zget($hasFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
+        <td class='<?php echo zget($hasFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
+        <td class='<?php echo zget($hasFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
+        <td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', 'class=form-control');?></td>
       </tr>
       <?php $i++;?>
       <?php endforeach;?>
@@ -93,27 +99,28 @@
       $moduleID  = $i - $nextStart == 0 ? $moduleID  : 'ditto';
       $projectID = $i - $nextStart == 0 ? $projectID  : 'ditto';
       $type      = $i - $nextStart == 0 ? '' : 'ditto';
+      $pri       = $i - $nextStart == 0 ? 0  : 'ditto';
       $os        = $i - $nextStart == 0 ? '' : 'ditto';
       $browser   = $i - $nextStart == 0 ? '' : 'ditto';
       ?>
       <tr class='text-center'>
         <td><?php echo $i+1;?></td>
-        <td class='text-left' style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
-        <td class='text-left' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
+        <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
+        <td class='text-left<?php echo zget($hasFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
         <td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control chosen' multiple");?></td>
         <td><?php echo html::input("title[$i]", '', 'class=form-control');?></td>
-        <td>
-          <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?>
-        </td>
-        <td><?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
-        <td><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
-        <td><?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
-        <td><?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
+        <td class='<?php echo zget($hasFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
+        <td class='<?php echo zget($hasFields, 'type', 'hidden')?>'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
+        <td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
+        <td class='<?php echo zget($hasFields, 'severity', 'hidden')?>'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
+        <td class='<?php echo zget($hasFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control'");?></td>
+        <td class='<?php echo zget($hasFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control'");?></td>
+        <td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', 'class=form-control');?></td>
       </tr>
       <?php endfor;?>
     </tbody>
     <tfoot>
-      <tr><td colspan='8' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+      <tr><td colspan='<?php echo count($hasFields) + 3?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
     </tfoot>
   </table>
 </form>
@@ -121,20 +128,22 @@
   <tbody>
     <tr class='text-center'>
       <td>%s</td>
-      <td class='text-left' style='overflow:visible'><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
-      <td class='text-left' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control' onchange='loadProjectBuilds($productID, this.value, \"%s\")'");?></td>
+      <td class='text-left<?php echo zget($hasFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
+      <td class='text-left<?php echo zget($hasFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control' onchange='loadProjectBuilds($productID, this.value, \"%s\")'");?></td>
       <td class='text-left' style='overflow:visible' id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control' multiple");?></td>
       <td><?php echo html::input("titles[%s]", '', 'class=form-control');?></td>
-      <td>
-        <?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?>
-      </td>
-      <td><?php echo html::select("types[%s]", $lang->bug->typeList, '', "class='form-control'");?></td>
-      <td><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control'");?></td>
-      <td><?php echo html::select("oses[%s]", $lang->bug->osList, '', "class='form-control'");?></td>
-      <td><?php echo html::select("browsers[%s]", $lang->bug->browserList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($hasFields, 'steps', 'hidden')?>'>   <?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?></td>
+      <td class='<?php echo zget($hasFields, 'type', 'hidden')?>'>    <?php echo html::select("types[%s]", $lang->bug->typeList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($hasFields, 'pri', 'hidden')?>'>     <?php echo html::select("pris[%s]", $lang->bug->priList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($hasFields, 'severity', 'hidden')?>'><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($hasFields, 'os', 'hidden')?>'>      <?php echo html::select("oses[%s]", $lang->bug->osList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($hasFields, 'browser', 'hidden')?>'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, '', "class='form-control'");?></td>
+      <td class='<?php echo zget($hasFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[%s]", '', 'class=form-control');?></td>
     </tr>
   </tbody>
 </table>
 <?php js::set('branch', $branch)?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=bug&section=custom&key=batchcreate')?>
+<?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/pastetext.html.php';?>
 <?php include '../../common/view/footer.html.php';?>