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

Merge branch 'MDL-49281-28' of git://github.com/mastnym/moodle into MOODLE_28_STABLE

Browse Source
This commit is contained in:
David Monllao
2015-04-30 14:54:04 +08:00
parent 95bfd8108b 986ee9fd2a
commit a3a4c4f028
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/edit/tree/lib.php
+5 -2
View File
@@ -136,8 +136,11 @@ class grade_edit_tree {
if (!$is_category_item && ($icon = $this->gtree->get_edit_icon($element, $this->gpr, true))) {
$actionsmenu->add($icon);
}
if ($this->show_calculations && ($icon = $this->gtree->get_calculation_icon($element, $this->gpr, true))) {
// MDL-49281 if grade_item already has calculation, it should be editable even if global setting is off.
$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);
}