From f02fec4cc26962fcc2417d3b6c775d9df8f3fd52 Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Mon, 22 Jul 2013 15:29:34 +0800
Subject: [PATCH]  * finish task#1612.

---
 module/testtask/control.php          |  4 ++--
 module/testtask/view/browse.html.php | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index e111a3c902..d10b58099b 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -66,10 +66,10 @@ class testtask extends control
         $this->view->position[]  = $this->lang->testtask->common;
         $this->view->productID   = $productID;
         $this->view->productName = $this->products[$productID];
-        $this->view->pager       = $pager;
         $this->view->orderBy     = $orderBy;
-        $this->view->tasks       = $this->testtask->getProductTasks($productID);
+        $this->view->tasks       = $this->testtask->getProductTasks($productID, $orderBy, $pager);
         $this->view->users       = $this->loadModel('user')->getPairs('noclosed|noletter');
+        $this->view->pager       = $pager;
 
         $this->display();
     }
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 0db074797c..79d18adc08 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -11,22 +11,22 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/tablesorter.html.php';?>
 <table class='table-1 colored tablesorter fixed'>
   <caption class='caption-tl'>
     <div class='f-left'><?php echo $lang->testtask->browse;?></div>
     <div class='f-right'><?php common::printIcon('testtask', 'create', "product=$productID");?></div>
   </caption>
   <thead>
+  <?php $vars = "productID=$productID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
   <tr class='colhead'>
-    <th class='w-id'><?php echo $lang->idAB;?></th>
-    <th><?php echo $lang->testtask->name;?></th>
-    <th><?php echo $lang->testtask->project;?></th>
-    <th><?php echo $lang->testtask->build;?></th>
-    <th class='w-user'><?php echo $lang->testtask->owner;?></th>
-    <th class='w-80px'><?php echo $lang->testtask->begin;?></th>
-    <th class='w-80px'><?php echo $lang->testtask->end;?></th>
-    <th class='w-50px'><?php echo $lang->statusAB;?></th>
+    <th class='w-id'>  <?php common::printOrderLink('id',      $orderBy, $vars, $lang->idAB);?></th>
+    <th>               <?php common::printOrderLink('name',    $orderBy, $vars, $lang->testtask->name);?></th>
+    <th>               <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
+    <th>               <?php common::printOrderLink('build',   $orderBy, $vars, $lang->testtask->build);?></th>
+    <th class='w-user'><?php common::printOrderLink('owner',   $orderBy, $vars, $lang->testtask->owner);?></th>
+    <th class='w-80px'><?php common::printOrderLink('begin',   $orderBy, $vars, $lang->testtask->begin);?></th>
+    <th class='w-80px'><?php common::printOrderLink('end',     $orderBy, $vars, $lang->testtask->end);?></th>
+    <th class='w-50px'><?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
     <th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
   </tr>
   </thead>
@@ -52,5 +52,6 @@
   </tr>
   <?php endforeach;?>
   </tbody>
+  <tr><td colspan='9'><?php $pager->show();?></td></tr>
 </table>
 <?php include '../../common/view/footer.html.php';?>