L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-30828_feedback_sort_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

Browse Source
This commit is contained in:
Aparup Banerjee
2012-01-31 16:51:47 +08:00
parent 5d8d3a1a08 cfc8537034
commit 49b52b3fb4
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/lib.php
+5 -2
View File
@@ -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) {
mod/feedback/show_entries.php
+1 -1
View File
@@ -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)) {