MDL-49281 grades: Calculation settings upgraded

moodle · Apr 30, 2015 · 986ee9f · 986ee9f
1 parent ee05689
commit 986ee9f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
@@ -136,8 +136,11 @@ public function build_html_tree($element, $totals, $parents, $level, &$row_count
         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);
         }