From cfc8537034aafd854841f85d0fce8d8bc52a2b79 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Wed, 28 Dec 2011 15:28:17 +0700 Subject: [PATCH] MDL-30828 mod_feedback: fixed sorting when viewing responses --- mod/feedback/lib.php | 7 +++++-- mod/feedback/show_entries.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php index 8795de24c48..f818fea6047 100644 --- a/mod/feedback/lib.php +++ b/mod/feedback/lib.php @@ -879,8 +879,11 @@ function feedback_get_complete_users($cm, $group = false, $where = '', array $pa } $ufields = user_picture::fields('u'); - $sql = 'SELECT DISTINCT '.$ufields.' FROM {user} u, {feedback_completed} c '.$fromgroup.' - WHERE '.$where.' anonymous_response = :anon AND u.id = c.userid AND c.feedback = :instance + $sql = 'SELECT DISTINCT '.$ufields.', c.timemodified as completed_timemodified + FROM {user} u, {feedback_completed} c '.$fromgroup.' + WHERE '.$where.' anonymous_response = :anon + AND u.id = c.userid + AND c.feedback = :instance '.$wheregroup.$sortsql; if ($startpage === false OR $pagecount === false) { diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php index 8916ca79c2b..d19da3dc558 100644 --- a/mod/feedback/show_entries.php +++ b/mod/feedback/show_entries.php @@ -104,7 +104,7 @@ if($do_show == 'showentries'){ $baseurl = new moodle_url('/mod/feedback/show_entries.php'); $baseurl->params(array('id'=>$id, 'do_show'=>$do_show, 'showall'=>$showall)); - $tablecolumns = array('userpic', 'fullname', 'c.timemodified'); + $tablecolumns = array('userpic', 'fullname', 'completed_timemodified'); $tableheaders = array(get_string('userpic'), get_string('fullnameuser'), get_string('date')); if(has_capability('mod/feedback:deletesubmissions', $context)) {