mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

MDL-49281 grades: Calculation settings upgraded

Browse Source
This commit is contained in:
Martin Mastny 2015-04-16 14:21:35 +08:00
parent d5d23acdf5
commit 5c3b5143dc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
grade/edit/tree/lib.php
View File

@ -136,8 +136,11 @@ class grade_edit_tree {
if (!$is_category_item && ($icon = $this->gtree->get_edit_icon($element, $this->gpr, true))) { if (!$is_category_item && ($icon = $this->gtree->get_edit_icon($element, $this->gpr, true))) {
$actionsmenu->add($icon); $actionsmenu->add($icon);
} }
// MDL-49281 if grade_item already has calculation, it should be editable even if global setting is off.
if ($this->show_calculations && ($icon = $this->gtree->get_calculation_icon($element, $this->gpr, true))) { $type = $element['type'];
$iscalculated = ($type == 'item' or $type == 'courseitem' or $type == 'categoryitem') && $object->is_calculated();
$icon = $this->gtree->get_calculation_icon($element, $this->gpr, true);
if ($iscalculated || ($this->show_calculations && $icon)) {
$actionsmenu->add($icon); $actionsmenu->add($icon);
} }