Merge branch 'MDL-48187_master' of git://github.com/markn86/moodle

This commit is contained in:
David Monllao 2015-04-20 12:20:28 +08:00
commit 970d54d076

View file

@ -225,13 +225,14 @@ function edit_module_post_actions($moduleinfo, $course) {
} }
$moduleinfo->gradecat = $grade_category->id; $moduleinfo->gradecat = $grade_category->id;
} }
$gradecategory = $grade_item->get_parent_category();
foreach ($items as $itemid=>$unused) { foreach ($items as $itemid=>$unused) {
$items[$itemid]->set_parent($moduleinfo->gradecat); $items[$itemid]->set_parent($moduleinfo->gradecat);
if ($itemid == $grade_item->id) { if ($itemid == $grade_item->id) {
// Use updated grade_item. // Use updated grade_item.
$grade_item = $items[$itemid]; $grade_item = $items[$itemid];
} }
$gradecategory = $grade_item->get_parent_category();
if (!empty($moduleinfo->add)) { if (!empty($moduleinfo->add)) {
if (grade_category::aggregation_uses_aggregationcoef($gradecategory->aggregation)) { if (grade_category::aggregation_uses_aggregationcoef($gradecategory->aggregation)) {
if ($gradecategory->aggregation == GRADE_AGGREGATE_WEIGHTED_MEAN) { if ($gradecategory->aggregation == GRADE_AGGREGATE_WEIGHTED_MEAN) {