Merge branch 'MDL-30828_feedback_sort' of git://github.com/andyjdavis/moodle

This commit is contained in:
Aparup Banerjee 2012-01-31 16:48:59 +08:00
commit d7da31228e
2 changed files with 2 additions and 2 deletions

View File

@ -958,7 +958,7 @@ function feedback_get_complete_users($cm,
}
$ufields = user_picture::fields('u');
$sql = 'SELECT DISTINCT '.$ufields.'
$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

View File

@ -122,7 +122,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)) {