mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-13690 activity outcome items do not support calculation - remove calc icon; merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
skodak 2008-02-27 10:11:22 +00:00
parent 5fdd5693fe
commit ff1bc6034d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grade/edit/tree/calculation.php
View File

@ -49,9 +49,8 @@ if (!$grade_item = grade_item::fetch(array('id'=>$id, 'courseid'=>$course->id)))
error('Incorect item id');
}
// module items and items without grade can not have calculation
if (($grade_item->is_external_item() and !$grade_item->is_outcome_item())
or ($grade_item->gradetype != GRADE_TYPE_VALUE and $grade_item->gradetype != GRADE_TYPE_SCALE)) {
// activity items and items without grade can not have calculation
if ($grade_item->is_external_item() or ($grade_item->gradetype != GRADE_TYPE_VALUE and $grade_item->gradetype != GRADE_TYPE_SCALE)) {
redirect($returnurl, get_string('errornocalculationallowed', 'grades'));
}

3
grade/lib.php
View File

@ -1096,8 +1096,7 @@ class grade_structure {
$streditcalculation = get_string('editcalculationverbose', 'grades', $strparams);
// show calculation icon only when calculation possible
if ((!$object->is_external_item() or $object->is_outcome_item())
and ($object->gradetype == GRADE_TYPE_SCALE or $object->gradetype == GRADE_TYPE_VALUE)) {
if (!$object->is_external_item() and ($object->gradetype == GRADE_TYPE_SCALE or $object->gradetype == GRADE_TYPE_VALUE)) {
if ($object->is_calculated()) {
$icon = 'calc.gif';
} else {