mirror of
https://github.com/moodle/moodle.git
synced 2025-07-16 20:06:30 +02:00
MDL-9506 Resolved a small bug in grade_category that failed the set_as_parent method.
This commit is contained in:
@@ -743,10 +743,11 @@ class grade_category extends grade_object {
|
|||||||
debugging("Could not update this category's sortorder in DB.");
|
debugging("Could not update this category's sortorder in DB.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$query = "UPDATE {$CFG->prefix}grade_items SET sortorder = sortorder + 1 WHERE sortorder >= $this->grade_item->sortorder";
|
$query = "UPDATE {$CFG->prefix}grade_items SET sortorder = sortorder + 1 WHERE sortorder >= {$this->grade_item->sortorder}";
|
||||||
if (!execute_sql($query)) {
|
if (!execute_sql($query)) {
|
||||||
debugging("Could not update the sortorder of grade_items listed after this category.");
|
debugging("Could not update the sortorder of grade_items listed after this category.");
|
||||||
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@@ -223,6 +223,7 @@ class grade_category_test extends gradelib_test {
|
|||||||
$grade_category = new grade_category();
|
$grade_category = new grade_category();
|
||||||
$grade_category->fullname = 'new topcategory';
|
$grade_category->fullname = 'new topcategory';
|
||||||
$grade_category->courseid = $this->courseid;
|
$grade_category->courseid = $this->courseid;
|
||||||
|
$grade_category->insert();
|
||||||
|
|
||||||
// 1. mixed types of children
|
// 1. mixed types of children
|
||||||
$child1 = new grade_item();
|
$child1 = new grade_item();
|
||||||
@@ -254,6 +255,8 @@ class grade_category_test extends gradelib_test {
|
|||||||
$child2->itemname = 'new grade_item';
|
$child2->itemname = 'new grade_item';
|
||||||
$child1->sortorder = 1;
|
$child1->sortorder = 1;
|
||||||
$child2->sortorder = 2;
|
$child2->sortorder = 2;
|
||||||
|
$child1->insert();
|
||||||
|
$child2->insert();
|
||||||
$this->assertTrue($grade_category->set_as_parent(array($child1, $child2)));
|
$this->assertTrue($grade_category->set_as_parent(array($child1, $child2)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user