X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb_pager.inc;h=48359f3cf510cb66b65ceffa5078c80e57a6414f;hb=1571869d54be48452fdbe08f25130972ff0a7b5a;hp=f3f0050db32da69dffc2296200f52a039b428ee6;hpb=e8a396f9731dda3f3febdcc3ec258add1dbe972b;p=fa-stable.git

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index f3f0050d..48359f3c 100644
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -143,7 +143,16 @@ class db_pager {
 	//
 	function sort_table($col) 
 	{
+
+			$max_priority = 0;
+			foreach($this->columns as $id => $_col) {
+			if(!isset($_col['ord_priority'])) continue;
+				$max_priority = max($max_priority, $_col['ord_priority']);
+			};
+
+
 	    $ord = $this->columns[$col]['ord'];
+  		$this->columns[$col]['ord_priority']  = $max_priority+1; // set priority , higher than anything else
 	    $ord = ($ord == '') ? 'asc' : (($ord == 'asc') ? 'desc' : '');
 	    $this->columns[$col]['ord'] = $ord;
 	    $this->set_page(1);
@@ -288,7 +297,16 @@ class db_pager {
 		if ($group) $sql.= " GROUP BY $group";
 	    $ord = array();
 
+			// sort order column by priority instead of table order.
+			$columns = array();
 	    foreach ($this->columns as $col) {
+					if(isset($col['ord_priority'])) {
+						$columns[$col['ord_priority']] = $col;
+					}
+			}
+			krsort($columns);
+
+	    foreach ($columns as $col) {
 	       	if (isset($col['ord'])) {
 	        	if ( $col['ord'] != '' && isset($col['name'])) {
 		    	    $ord[] = $col['name'] .' '. $col['ord'];
@@ -337,7 +355,7 @@ class db_pager {
 		    	   	if (isset($col['ord']) && $col['ord'] != '' 
 						&&  !isset($col['name'])) {
 							display_warning("Result field names must be set
-								for all intially ordered db_pager columns.");
+								for all initially ordered db_pager columns.");
 			    	}
 				}
 	    	}
@@ -486,4 +504,4 @@ function refresh_pager($name)
 	if (isset($_SESSION[$name]))
 		$_SESSION[$name]->ready = false;
 }
-?>
\ No newline at end of file
+?>