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

Merge branch 'MDL-32714-rubric_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2012-05-14 10:42:00 +08:00
parent 2fe83e04d9 6e7e184571
commit ac6f7b2c96
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/workshop/form/rubric/lib.php
+7 -4
View File
@@ -418,16 +418,17 @@ class workshop_rubric_strategy implements workshop_strategy {
protected function load_fields() {
global $DB;
$sql = 'SELECT l.id AS lid, r.id AS rid, r.*, l.*
$sql = "SELECT r.id AS rid, r.sort, r.description, r.descriptionformat,
l.id AS lid, l.grade, l.definition, l.definitionformat
FROM {workshopform_rubric} r
LEFT JOIN {workshopform_rubric_levels} l ON (l.dimensionid = r.id)
WHERE r.workshopid = :workshopid
ORDER BY r.sort, l.grade';
ORDER BY r.sort, l.grade";
$params = array('workshopid' => $this->workshop->id);
$records = $DB->get_records_sql($sql, $params);
$rs = $DB->get_recordset_sql($sql, $params);
$fields = array();
foreach ($records as $record) {
foreach ($rs as $record) {
if (!isset($fields[$record->rid])) {
$fields[$record->rid] = new stdclass();
$fields[$record->rid]->id = $record->rid;
@@ -444,6 +445,8 @@ class workshop_rubric_strategy implements workshop_strategy {
$fields[$record->rid]->levels[$record->lid]->definitionformat = $record->definitionformat;
}
}
$rs->close();
return $fields;
}