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

Merge branch 'MOODLE_26_STABLE' into install_26_STABLE

Browse Source
This commit is contained in:
AMOS bot
2014-11-21 00:05:49 +08:00
parent 2002c90ff2 b6e289615f
commit a2b62eebcb
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/report/overview/lib.php
+1 -1
View File
@@ -249,7 +249,7 @@ function grade_report_overview_settings_definition(&$mform) {
0 => get_string('hide'),
1 => get_string('show'));
if (empty($CFG->grade_overviewreport_showrank)) {
if (empty($CFG->grade_report_overview_showrank)) {
$options[-1] = get_string('defaultprev', 'grades', $options[0]);
} else {
$options[-1] = get_string('defaultprev', 'grades', $options[1]);
grade/report/overview/settings.php
+2 -1
View File
@@ -26,7 +26,8 @@ defined('MOODLE_INTERNAL') || die;
if ($ADMIN->fulltree) {
$settings->add(new admin_setting_configcheckbox('grade_report_overview_showrank', get_string('showrank', 'grades'), get_string('showrank_help', 'grades'), 0, PARAM_INT));
$settings->add(new admin_setting_configcheckbox('grade_report_overview_showrank', get_string('showrank', 'grades'),
get_string('showrank_help', 'grades'), 0));
$settings->add(new admin_setting_configselect('grade_report_overview_showtotalsifcontainhidden', get_string('hidetotalifhiddenitems', 'grades'),
get_string('hidetotalifhiddenitems_help', 'grades'), GRADE_REPORT_HIDE_TOTAL_IF_CONTAINS_HIDDEN,
question/type/calculated/questiontype.php
-11
View File
@@ -1082,17 +1082,6 @@ class qtype_calculated extends question_type {
$ans = new qtype_numerical_answer(0, $ansvalue, 0, '', 0, $answer->tolerance);
$ans->tolerancetype = $answer->tolerancetype;
list($answer->min, $answer->max) = $ans->get_tolerance_interval($answer);
$formattedmin = qtype_calculated_calculate_answer(
$answer->min, $data, $answer->tolerance,
$answer->tolerancetype, $answer->correctanswerlength,
$answer->correctanswerformat, $unit);
$answer->min = $formattedmin->answer;
$formattedmax = qtype_calculated_calculate_answer(
$answer->max, $data, $answer->tolerance,
$answer->tolerancetype, $answer->correctanswerlength,
$answer->correctanswerformat, $unit);
$answer->max = $formattedmax->answer;
}
if ($answer->min === '') {
// This should mean that something is wrong.