From 804786bae1831d8d7fe4e36388f5b8c222b450e2 Mon Sep 17 00:00:00 2001 From: Maxime Bourget Date: Sun, 23 Jun 2013 21:02:39 +0100 Subject: [PATCH] Improved db_pager widget sorting (now user column selection order is used). --- includes/db_pager.inc | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/includes/db_pager.inc b/includes/db_pager.inc index f3f0050d..598d6964 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']; @@ -486,4 +504,4 @@ function refresh_pager($name) if (isset($_SESSION[$name])) $_SESSION[$name]->ready = false; } -?> \ No newline at end of file +?> -- 2.30.2