From 9d5aae6edcb1842a56f4cb5f4436d6972072227c Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Mon, 22 Jul 2013 14:16:11 +0800
Subject: [PATCH]  * finish task #1585.

---
 module/my/view/caselist.html.php | 76 ++++++++++++++++++++++++++++++
 module/my/view/testcase.html.php | 80 ++------------------------------
 2 files changed, 79 insertions(+), 77 deletions(-)
 create mode 100644 module/my/view/caselist.html.php

diff --git a/module/my/view/caselist.html.php b/module/my/view/caselist.html.php
new file mode 100644
index 0000000000..c01e1eac45
--- /dev/null
+++ b/module/my/view/caselist.html.php
@@ -0,0 +1,76 @@
+<table class='table-1 fixed tablesorter colored' id='caseList'>
+  <?php 
+    $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
+    $this->app->loadLang('testtask');
+  ?>
+  <thead>
+    <tr class='colhead'>
+      <th class='w-id'>    <?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
+      <th class='w-pri'>   <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+      <th>                 <?php common::printOrderLink('title',    $orderBy, $vars, $lang->testcase->title);?></th>
+      <th class='w-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
+      <th class='w-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+      <th class='w-80px'>  <?php common::printOrderLink('lastRunner',    $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
+      <th class='w-120px'> <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
+      <th class='w-80px'>  <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
+      <th class='w-status'><?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
+      <th class='w-140px'><?php echo $lang->actions;?></th>
+    </tr>
+  </thead>
+  <tbody>
+    <?php
+    $canBatchEdit = common::hasPriv('testcase', 'batchEdit');
+    $canBatchRun  = common::hasPriv('testtask', 'batchRun');
+    ?>
+    <?php foreach($cases as $case):?>
+    <tr class='a-center'>
+      <td>
+        <?php if($canBatchEdit or $canBatchRun):?><input type='checkbox' name='caseIDList[]'  value='<?php echo $case->id;?>'/><?php endif;?>
+        <?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?>
+      </td>
+      <td><span class='<?php echo 'pri' . $case->pri?>'><?php echo $case->pri?></span</td>
+      <td class='a-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?></td>
+      <td><?php echo $lang->testcase->typeList[$case->type];?></td>
+      <td><?php echo $users[$case->openedBy];?></td>
+      <td><?php echo $users[$case->lastRunner];?></td>
+      <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
+      <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
+      <td class='<?php echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
+      <td>
+      <?php
+      common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', '', '', 'iframe');
+      common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', '', '', 'iframe');
+      common::printIcon('testcase', 'edit',    "caseID=$case->id", $case, 'list');
+      common::printIcon('testcase', 'create',  "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $case, 'list', 'copy');
+      common::printIcon('testcase', 'delete',  "caseID=$case->id", '', 'list', '', 'hiddenwin');
+      common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug');
+      ?>
+      </td>
+    </tr>
+    <?php endforeach;?>
+  </tbody> 
+  <tfoot>
+    <tr>
+      <td colspan='10'>
+        <?php if($cases):?>
+        <div class='f-left'>
+        <?php
+        if($canBatchEdit or $canBatchRun) echo html::selectAll() . html::selectReverse(); 
+        if($canBatchEdit) 
+        {
+            $actionLink = $this->createLink('testcase', 'batchEdit');
+            echo html::submitButton($lang->edit, "onclick=changeAction('myCaseForm','batchEdit','$actionLink')");
+        }
+        if($canBatchRun) 
+        {
+            $actionLink = $this->createLink('testtask', 'batchRun', "productID=0&orderBy=$orderBy&from=testcase");
+            echo html::submitButton($lang->testtask->runCase,  "onclick=changeAction('myCaseForm','batchEdit','$actionLink')");
+        }
+        ?>
+        </div>
+        <?php endif?>
+        <?php $pager->show();?>
+      </td>
+    </tr>
+  </tfoot>
+</table>
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index f0eda57630..538eada6c9 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -10,6 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
+<?php if(isset($_GET['ajax']) and $_GET['ajax'] == 'yes') die(include "./caselist.html.php");?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
 <div id='featurebar'>
@@ -23,84 +24,9 @@
   </div>
 </div>
 
-<?php $vars = "type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
 <form method='post' id='myCaseForm'>
-<table class='table-1 fixed tablesorter colored'>
-  <?php 
-    $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
-    $this->app->loadLang('testtask');
-  ?>
-  <thead>
-    <tr class='colhead'>
-      <th class='w-id'>    <?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
-      <th class='w-pri'>   <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
-      <th>                 <?php common::printOrderLink('title',    $orderBy, $vars, $lang->testcase->title);?></th>
-      <th class='w-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
-      <th class='w-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-      <th class='w-80px'>  <?php common::printOrderLink('lastRunner',    $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
-      <th class='w-120px'> <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
-      <th class='w-80px'>  <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
-      <th class='w-status'><?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
-      <th class='w-140px'><?php echo $lang->actions;?></th>
-    </tr>
-  </thead>
-  <tbody>
-    <?php
-    $canBatchEdit = common::hasPriv('testcase', 'batchEdit');
-    $canBatchRun  = common::hasPriv('testtask', 'batchRun');
-    ?>
-    <?php foreach($cases as $case):?>
-    <tr class='a-center'>
-      <td>
-        <?php if($canBatchEdit or $canBatchRun):?><input type='checkbox' name='caseIDList[]'  value='<?php echo $case->id;?>'/><?php endif;?>
-        <?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?>
-      </td>
-      <td><span class='<?php echo 'pri' . $case->pri?>'><?php echo $case->pri?></span</td>
-      <td class='a-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?></td>
-      <td><?php echo $lang->testcase->typeList[$case->type];?></td>
-      <td><?php echo $users[$case->openedBy];?></td>
-      <td><?php echo $users[$case->lastRunner];?></td>
-      <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
-      <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
-      <td class='<?php echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
-      <td>
-      <?php
-      common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', '', '', 'iframe');
-      common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', '', '', 'iframe');
-      common::printIcon('testcase', 'edit',    "caseID=$case->id", $case, 'list');
-      common::printIcon('testcase', 'create',  "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $case, 'list', 'copy');
-      common::printIcon('testcase', 'delete',  "caseID=$case->id", '', 'list', '', 'hiddenwin');
-      common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug');
-      ?>
-      </td>
-    </tr>
-    <?php endforeach;?>
-  </tbody> 
-  <tfoot>
-    <tr>
-      <td colspan='10'>
-        <?php if($cases):?>
-        <div class='f-left'>
-        <?php
-        if($canBatchEdit or $canBatchRun) echo html::selectAll() . html::selectReverse(); 
-        if($canBatchEdit) 
-        {
-            $actionLink = $this->createLink('testcase', 'batchEdit');
-            echo html::submitButton($lang->edit, "onclick=changeAction('myCaseForm','batchEdit','$actionLink')");
-        }
-        if($canBatchRun) 
-        {
-            $actionLink = $this->createLink('testtask', 'batchRun', "productID=0&orderBy=$orderBy&from=testcase");
-            echo html::submitButton($lang->testtask->runCase,  "onclick=changeAction('myCaseForm','batchEdit','$actionLink')");
-        }
-        ?>
-        </div>
-        <?php endif?>
-        <?php $pager->show();?>
-      </td>
-    </tr>
-  </tfoot>
-</table>
+<?php include './caselist.html.php';?>
 </form>
+<?php js::set('listName', 'caseList')?>
 <script language="Javascript">$("#<?php echo $type;?>Tab").addClass('active'); </script>
 <?php include '../../common/view/footer.html.php';?>