From c1ae6ad0bf60b37b44f3920d89b2d2001a85a53e Mon Sep 17 00:00:00 2001
From: nbm <nbm@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Sun, 19 Feb 2006 10:41:28 +0000
Subject: [PATCH] Return proper sorting information for DateColumns and UserColumns.

---
 lib/browse/BrowseColumns.inc.php | 46 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/lib/browse/BrowseColumns.inc.php b/lib/browse/BrowseColumns.inc.php
index bc10956..2e7dda0 100644
--- a/lib/browse/BrowseColumns.inc.php
+++ b/lib/browse/BrowseColumns.inc.php
@@ -33,7 +33,11 @@ class BrowseColumn {
     function renderHeader($sReturnURL) { 
         $text = _("Abstract") . ": " . $this->label; 
         $href = $sReturnURL . "&sort_on=" . $this->name . "&sort_order=";
-        $href .= $this->sort_direction == "asc" ? "desc" : "asc" ;
+        if ($this->sort_on) {
+            $href .= $this->sort_direction == "asc" ? "desc" : "asc" ;
+        } else {
+            $href .= $this->sort_direction = "asc";
+        }
         
         return '<a href="' . $href . '">'.$text.'</a>';
         
@@ -63,7 +67,11 @@ class TitleColumn extends BrowseColumn {
     function renderHeader($sReturnURL) { 
         $text = _("Title");
         $href = $sReturnURL . "&sort_on=" . $this->name . "&sort_order=";
-        $href .= $this->sort_direction == "asc" ? "desc" : "asc" ;
+        if ($this->sort_on) {
+            $href .= $this->sort_direction == "asc" ? "desc" : "asc" ;
+        } else {
+            $href .= $this->sort_direction = "asc";
+        }
         
         return '<a href="' . $href . '">'.$text.'</a>';
         
@@ -144,7 +152,11 @@ class DateColumn extends BrowseColumn {
     function renderHeader($sReturnURL) { 
         $text = $this->label;
         $href = $sReturnURL . "&sort_on=" . $this->name . "&sort_order=";
-        $href .= $this->sort_direction == "asc" ? "desc" : "asc" ;
+        if ($this->sort_on) {
+            $href .= $this->sort_direction == "asc" ? "desc" : "asc" ;
+        } else {
+            $href .= $this->sort_direction = "asc";
+        }
         
         return '<a href="' . $href . '">'.$text.'</a>';
         
@@ -176,6 +188,13 @@ class DateColumn extends BrowseColumn {
            return 'unspecified_type';
         }
     }
+
+    function addToFolderQuery() {
+        return array(null, null, null);
+    }
+    function addToDocumentQuery() {
+        return array(null, null, $this->name);
+    }
 }
 
 
@@ -192,7 +211,11 @@ class UserColumn extends BrowseColumn {
     function renderHeader($sReturnURL) { 
         $text = $this->label;
         $href = $sReturnURL . "&sort_on=" . $this->name . "&sort_order=";
-        $href .= $this->sort_direction == "asc" ? "desc" : "asc" ;
+        if ($this->sort_on) {
+            $href .= $this->sort_direction == "asc" ? "desc" : "asc" ;
+        } else {
+            $href .= $this->sort_direction = "asc";
+        }
         
         return '<a href="' . $href . '">'.$text.'</a>';
         
@@ -220,6 +243,15 @@ class UserColumn extends BrowseColumn {
         }
         return $outStr;
     }
+
+    function addToFolderQuery() {
+        return array(null, null, null);
+    }
+    function addToDocumentQuery() {
+        $sUsersTable = KTUtil::getTableName('users');
+        $sJoinSQL = "LEFT JOIN $sUsersTable AS users_order_join ON D.{$this->name} = users_order_join.id";
+        return array($sJoinSQL, null, "users_order_join.name");
+    }
 }
 
 // use the _name_ parameter + _f_ + id to create a non-clashing checkbox.
@@ -272,7 +304,11 @@ class WorkflowColumn extends BrowseColumn {
     function renderHeader($sReturnURL) {         
         $text = $this->label; 
         $href = $sReturnURL . "&sort_on=" . $this->name . "&sort_order=";
-        $href .= $this->sort_direction == "asc" ? "desc" : "asc" ;
+        if ($this->sort_on) {
+            $href .= $this->sort_direction == "asc" ? "desc" : "asc" ;
+        } else {
+            $href .= $this->sort_direction = "asc";
+        }
         
         return '<a href="' . $href . '">'.$text.'</a>';
     }
--
libgit2 0.21.4