From: cataluke <cataluke>
Date: Wed, 18 Apr 2007 02:11:09 +0000 (+0000)
Subject: MDL-8569 - mod/data sorting by numerical field now works with PostgreSQL
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b99b25ea04c0036de8d106b73d789bc8ea122965;p=moodle.git

MDL-8569 - mod/data sorting by numerical field now works with PostgreSQL


Author: Luke Hudson <luke@catalyst.net.nz>
---

diff --git a/mod/data/view.php b/mod/data/view.php
index 02e14c9430..f28a7b7f23 100755
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -375,7 +375,7 @@
             $sortcontent = $sortfield->get_sort_field();
             $sortcontentfull = $sortfield->get_sort_sql('c.'.$sortcontent);
 
-            $what = ' DISTINCT r.id, r.approved, r.userid, u.firstname, u.lastname, c.'.$sortcontent.' ';
+            $what = ' DISTINCT r.id, r.approved, r.userid, u.firstname, u.lastname, c.'.$sortcontent.', '.$sortcontentfull.' AS _order ';
             $count = ' COUNT(DISTINCT c.recordid) ';
             $tables = $CFG->prefix.'data_content c,'.$CFG->prefix.'data_records r,'.$CFG->prefix.'data_content c1, '.$CFG->prefix.'user u ';
             $where =  'WHERE c.recordid = r.id
@@ -383,7 +383,7 @@
                          AND r.dataid = '.$data->id.'
                          AND r.userid = u.id
                          AND c1.recordid = r.id ';
-            $sortorder = ' ORDER BY '.$sortcontentfull.' '.$order.' , r.id ASC ';
+            $sortorder = ' ORDER BY _order '.$order.' , r.id ASC ';
             $searchselect = '';
             
             if (!empty($advanced)) {                                                                                           //If advanced box is checked.