From 4f23bc92db5980005259cb07ae0b635fe5fe4102 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Sun, 6 Jan 2013 03:03:10 +0000
Subject: [PATCH]  * code for task#1043.

---
 module/my/control.php       |  6 +++++-
 module/my/view/bug.html.php | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index 291ab22e78..6f609ed41b 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -197,7 +197,7 @@ class my extends control
                 ->where('t2.deleted')->eq(0)
                 ->andWhere('t1.deleted')->eq(0)
                 ->andWhere('t1.assignedTo')->eq($this->app->user->account)
-                ->orderBy('t1.id_desc')->page($pager)->fetchAll();
+                ->orderBy($orderBy)->page($pager)->fetchAll();
         }
         elseif($type == 'openedbyme')
         {
@@ -230,6 +230,10 @@ class my extends control
         $this->view->users         = $this->user->getPairs('noletter');
         $this->view->tabID         = 'bug';
         $this->view->type          = $type;
+        $this->view->recTotal      = $recTotal;
+        $this->view->recPerPage    = $recPerPage;
+        $this->view->pageID        = $pageID;
+        $this->view->orderBy       = $orderBy;
         $this->view->pager         = $pager;
 
         $this->display();
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index 677cd376d8..2e9eaedd06 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/tablesorter.html.php';?>
 <div id='featurebar'>
   <div class='f-left'>
     <?php
@@ -24,17 +23,18 @@
 </div>
 <?php $vars = "type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
 <table class='table-1 fixed tablesorter'>
+  <?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
   <thead>
   <tr class='colhead'>
-    <th class='w-id'><?php echo $lang->idAB;?></th>
-    <th class='w-severity'><?php echo $lang->bug->severityAB;?></th>
-    <th class='w-pri'><?php echo $lang->priAB;?></th>
-    <th class='w-type'><?php echo $lang->typeAB;?></th>
-    <th><?php echo $lang->bug->title;?></th>
-    <th class='w-user'><?php echo $lang->openedByAB;?></th>
-    <th class='w-user'><?php echo $lang->bug->resolvedByAB;?></th>
-    <th class='w-resolution'><?php echo $lang->bug->resolutionAB;?></th>
-    <th class='w-80px {sorter:false}'><?php echo $lang->actions;?></th>
+    <th class='w-id'>        <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
+    <th class='w-severity'>  <?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
+    <th class='w-pri'>       <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+    <th class='w-type'>      <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
+    <th>                     <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
+    <th class='w-user'>      <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+    <th class='w-user'>      <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
+    <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars,  $lang->bug->resolutionAB);?></th>
+    <th class='w-80px'><?php echo $lang->actions;?></th>
   </tr>
   </thead>
   <tbody>