Permalink
Browse files

MDL-36914: Assignment upgrade. Clean up patch to include outcomes in …

…the upgrade

Thanks to Nathan Mares for reporting this issue.
  • Loading branch information...
1 parent fb9c26d commit 16d31e237697b875c56f8b66a66b1af528c34d82 @damyon damyon committed Nov 29, 2012
Showing with 9 additions and 6 deletions.
  1. +9 −6 mod/assign/upgradelib.php
View
15 mod/assign/upgradelib.php
@@ -229,9 +229,11 @@ public function upgrade_assignment($oldassignmentid, & $log) {
$newassignment->update_calendar($newcoursemodule->id);
- // reassociate grade_items from the old assignment instance to the new assign instance. This includes outcome linked grade_items
- $sql = "UPDATE {grade_items} SET itemmodule = 'assign', iteminstance = ? WHERE itemmodule = 'assignment' AND iteminstance = ?";
- $DB->execute($sql, array($newassignment->get_instance()->id, $oldassignment->id));
+ // Reassociate grade_items from the old assignment instance to the new assign instance.
+ // This includes outcome linked grade_items.
+ $params = array('assign', $newassignment->get_instance()->id, 'assignment', $oldassignment->id);
+ $sql = 'UPDATE {grade_items} SET itemmodule = ?, iteminstance = ? WHERE itemmodule = ? AND iteminstance = ?';
+ $DB->execute($sql, $params);
$gradesdone = true;
@@ -243,9 +245,10 @@ public function upgrade_assignment($oldassignmentid, & $log) {
if ($rollback) {
// roll back the grades changes
if ($gradesdone) {
- // reassociate grade_items from the new assign instance to the old assignment instance
- $sql = "UPDATE {grade_items} SET itemmodule = 'assign', iteminstance = ? WHERE itemmodule = 'assignment' AND iteminstance = ?";
- $DB->execute($sql, array($oldassignment->id, $newassignment->get_instance()->id));
+ // Reassociate grade_items from the new assign instance to the old assignment instance.
+ $params = array('assignment', $oldassignment->id, 'assign', $newassignment->get_instance()->id);
+ $sql = 'UPDATE {grade_items} SET itemmodule = ?, iteminstance = ? WHERE itemmodule = ? AND iteminstance = ?';
+ $DB->execute($sql, $params);
}
// roll back the completion changes
if ($completiondone) {

0 comments on commit 16d31e2

Please sign in to comment.