Merge branch 'MDL-47610-master' of git://github.com/zbdd/moodle

roddle · Dec 16, 2014 · c236f82 · c236f82
2 parents eb7ab07 + 3712ee3
commit c236f82
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
@@ -427,11 +427,6 @@ static function get_weight_input($item) {
             );
 
             $str .= $checkboxlbl . $checkbox . $hiddenlabel . $input;
-
-            if ($item->aggregationcoef > 0) {
-                $str .= ' ' . html_writer::tag('abbr', get_string('aggregationcoefextrasumabbr', 'grades'),
-                        array('title' => get_string('aggregationcoefextrasum', 'grades')));
-            }
         }
 
         return $str;
@@ -771,6 +766,11 @@ public function get_item_cell($item, $params) {
             $grademax = format_float($item->grademax, $item->get_decimals());
         }
 
+        if ($item->aggregationcoef > 0 && $parent_cat->is_extracredit_used()) {
+            $grademax .= ' ' . html_writer::tag('abbr', get_string('aggregationcoefextrasumabbr', 'grades'),
+                array('title' => get_string('aggregationcoefextrasum', 'grades')));
+        }
+
         $itemcell = parent::get_item_cell($item, $params);
         $itemcell->text = $grademax;
         return $itemcell;