From 3e1a529e6d60d61247579b90e16133003920d816 Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Mon, 29 Jul 2013 14:42:45 +0800
Subject: [PATCH]  * code for task#1599.

---
 module/bug/js/batchcreate.js         |  4 ++--
 module/bug/model.php                 |  2 +-
 module/bug/view/batchcreate.html.php | 28 +++++++++++++---------------
 module/build/control.php             | 10 +++++++---
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/module/bug/js/batchcreate.js b/module/bug/js/batchcreate.js
index c58f7a11fd..9c64d3017c 100644
--- a/module/bug/js/batchcreate.js
+++ b/module/bug/js/batchcreate.js
@@ -17,11 +17,11 @@ function loadProjectBuilds(productID, projectID, index)
 {
     if(projectID)
     {
-        link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild');
+        link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + "&varName=openedBuilds&build=''&index=" + index);
     }
     else
     {
-        link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=openedBuild');
+        link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + "&varName=openedBuilds&build=''&index=" + index);
     }
 
     $.get(link, function(builds)
diff --git a/module/bug/model.php b/module/bug/model.php
index 5d879bcd3c..daa65c05b3 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -85,7 +85,7 @@ class bugModel extends model
             $bug->openedDate  = $now;
             $bug->product     = $productID;
             $bug->module      = $data->modules[$i];
-            $bug->project     = $data->projects[$i];
+            $bug->project     = $data->projects[$i] ? $data->projects[$i] : 0;
             $bug->openedBuild = implode(',', $data->openedBuilds[$i]);
             $bug->title       = $data->titles[$i];
             $bug->steps       = $data->stepses[$i];
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 4dd22e882e..5d1c997fdf 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -17,14 +17,16 @@
   <table class='table-1 fixed'> 
     <caption><?php echo $lang->bug->project . $lang->colon . $lang->bug->batchCreate;?></caption>
     <tr>
-      <th class='w-20px'>    <?php echo $lang->idAB;?></th> 
-      <th class='w-100px'>   <?php echo $lang->bug->module;?></th>
-      <th class='w-100px'>   <?php echo $lang->bug->project;?></th>
+      <th class='w-20px'>     <?php echo $lang->idAB;?></th> 
+      <th class='w-100px'>    <?php echo $lang->bug->module;?></th>
+      <th class='w-100px'>    <?php echo $lang->bug->project;?></th>
       <th class='w-150px red'><?php echo $lang->bug->openedBuild;?></th>
-      <th class='red'>       <?php echo $lang->bug->title;?></th>
-      <th>                   <?php echo $lang->bug->steps;?></th>
-      <th class='w-120px'>   <?php echo $lang->bug->lblTypeAndSeverity;?></th>
-      <th class='w-220px'>   <?php echo $lang->bug->lblSystemBrowserAndHardware;?></th>
+      <th class='red'>        <?php echo $lang->bug->title;?></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>
     </tr>
 
    <?php for($i = 0; $i < $config->bug->batchCreate; $i++):?>
@@ -35,14 +37,10 @@
       <td class='a-left chosenBox' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='select-1' multiple");?></td>
       <td><?php echo html::input("titles[$i]", '', 'class=select-1');?></td>
       <td><?php echo html::textarea("stepses[$i]", '', "rows='1' class=text-1");?></td>
-      <td>
-        <?php echo html::select("types[$i]", $lang->bug->typeList, '');?> 
-        <?php echo html::select("severities[$i]", $lang->bug->severityList, '');?>
-      </td>
-      <td>
-        <?php echo html::select("oses[$i]", $lang->bug->osList, '');?>
-        <?php echo html::select("browsers[$i]", $lang->bug->browserList, '');?>
-      </td>
+      <td><?php echo html::select("types[$i]", $lang->bug->typeList, '');?></td>
+      <td><?php echo html::select("severities[$i]", $lang->bug->severityList, '');?></td>
+      <td><?php echo html::select("oses[$i]", $lang->bug->osList, '');?></td>
+      <td><?php echo html::select("browsers[$i]", $lang->bug->browserList, '');?></td>
     </tr>
     <?php endfor;?>
     <tr><td colspan='8' class='a-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
diff --git a/module/build/control.php b/module/build/control.php
index 82ee3fb829..944ede73ed 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -165,12 +165,14 @@ class build extends control
      * @param  int    $productID 
      * @param  string $varName      the name of the select object to create
      * @param  string $build        build to selected
+     * @param  int    $index        the index of batch create bug.
      * @access public
      * @return string
      */
-    public function ajaxGetProductBuilds($productID, $varName, $build = '')
+    public function ajaxGetProductBuilds($productID, $varName, $build = '', $index = 0)
     {
-        if($varName == 'openedBuild')   die(html::select($varName . '[]', $this->build->getProductBuildPairs($productID, 'noempty'), $build, 'size=4 class=select-3 multiple'));
+        if($varName == 'openedBuild' )  die(html::select($varName . '[]', $this->build->getProductBuildPairs($productID, 'noempty'), $build, 'size=4 class=select-3 multiple'));
+        if($varName == 'openedBuilds' ) die(html::select($varName . "[$index][]", $this->build->getProductBuildPairs($productID, 'noempty'), $build, 'size=4 class=select-3 multiple'));
         if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProductBuildPairs($productID, 'noempty'), $build, 'class=select-3'));
     }
 
@@ -180,12 +182,14 @@ class build extends control
      * @param  int    $projectID
      * @param  string $varName      the name of the select object to create
      * @param  string $build        build to selected
+     * @param  int    $index        the index of batch create bug.
      * @access public
      * @return string
      */
-    public function ajaxGetProjectBuilds($projectID, $productID, $varName, $build = '')
+    public function ajaxGetProjectBuilds($projectID, $productID, $varName, $build = '', $index = 0)
     {
         if($varName == 'openedBuild')   die(html::select($varName . '[]', $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'size=4 class=select-3 multiple'));
+        if($varName == 'openedBuilds')  die(html::select($varName . "[$index][]", $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'size=4 class=select-3 multiple'));
         if($varName == 'resolvedBuild') die(html::select($varName, $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'class=select-3'));
         if($varName == 'testTaskBuild') die(html::select('build', $this->build->getProjectBuildPairs($projectID, $productID, 'noempty'), $build, 'class=select-3'));
     }