Merge branch 'pailei'

module/testtask/control.php

@@ -1248,7 +1248,6 @@ class testtask extends control
             {
                 $this->loadModel('qa')->setMenu($this->products, $productID, $taskID);
             }
-            $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, 'case', 0, 'all');
 
             $cases = $this->dao->select('*')->from(TABLE_CASE)->where('id')->in($caseIDList)->fetchAll('id');
         }
@@ -1271,11 +1270,13 @@ class testtask extends control
                 ->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.id = t2.case')
                 ->where('t2.id')->in($caseIDList)
                 ->fetchAll('id');
-
-            $caseIDList = array();
-            foreach($cases as $case) $caseIDList[] = $case->id;
         }
 
+        /* Set modules. */
+        $moduleOptionMenu = array(0 => '/');
+        foreach($cases as $case) $moduleOptionMenu += $this->tree->getModulesName($case->module);
+        $this->view->moduleOptionMenu = $moduleOptionMenu;
+
         /* If case has changed and not confirmed, remove it. */
         if($from == 'testtask')
         {

module/testtask/view/batchrun.html.php

@@ -28,16 +28,9 @@
           <th><?php echo $lang->testcase->stepDesc . '/' . $lang->testcase->stepExpect?></th>
         </tr>
       </thead>
-      <?php $moduleOptionMenu = $productID ? $moduleOptionMenu : array();?>
       <?php foreach($cases as $caseID => $case):?>
       <?php if($case->status == 'wait') continue;?>
-      <?php
-      if(!$productID)
-      {
-          echo html::hidden("caseIDList[$case->id]", $caseID);
-          if(!isset($moduleOptionMenu[$case->module])) $moduleOptionMenu += $this->tree->getOptionMenu($case->product, 'case', 0, $case->branch);
-      }
-       ?>
+      <?php if(!$productID) echo html::hidden("caseIDList[$case->id]", $caseID); ?>
       <tr class='text-center'>
         <td><?php echo $caseID . html::hidden("version[$caseID]", $case->version)?></td>
         <td class='text-left'><?php echo "<span title='" . $moduleOptionMenu[$case->module] . "'>" . $moduleOptionMenu[$case->module] . "</span>"?></td>