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

Merge branch 'MDL-29336-numerrors-mapping-20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2011-09-26 12:36:18 +13:00
parent 3603e0856a c418df9c94
commit 5ea58ff4e1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/workshop/form/numerrors/lib.php
+4 -2
View File
@@ -164,6 +164,7 @@ class workshop_numerrors_strategy implements workshop_strategy {
$records = $data->numerrors; // data to be saved into {workshopform_numerrors}
$mappings = $data->mappings; // data to be saved into {workshopform_numerrors_map}
$todelete = array(); // dimension ids to be deleted
$maxnonegative = 0; // maximum number of (weighted) negative responses
for ($i=0; $i < $norepeats; $i++) {
$record = $records[$i];
@@ -181,6 +182,7 @@ class workshop_numerrors_strategy implements workshop_strategy {
// exiting field
$DB->update_record('workshopform_numerrors', $record);
}
$maxnonegative += $record->weight;
// re-save with correct path to embeded media files
$record = file_postupdate_standard_editor($record, 'description', $this->descriptionopts, $PAGE->context,
'workshopform_numerrors', 'description', $record->id);
@@ -212,8 +214,8 @@ class workshop_numerrors_strategy implements workshop_strategy {
$insql = '';
}
$sql = "DELETE FROM {workshopform_numerrors_map}
WHERE (($insql nonegative > :nodimensions) AND (workshopid = :workshopid))";
$params['nodimensions'] = $norepeats;
WHERE (($insql nonegative > :maxnonegative) AND (workshopid = :workshopid))";
$params['maxnonegative'] = $maxnonegative;
$params['workshopid'] = $this->workshop->id;
$DB->execute($sql, $params);
}