From 4ca17b63a13d06ddb3673ef2ccbe61425eb99ff0 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Sat, 21 May 2016 12:37:30 +0800 Subject: [PATCH] MDL-54666 modedit: use default values when modgrade element is frozen --- lib/form/modgrade.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/form/modgrade.php b/lib/form/modgrade.php index e6cdc731270..b33f4370cee 100644 --- a/lib/form/modgrade.php +++ b/lib/form/modgrade.php @@ -465,10 +465,12 @@ class MoodleQuickForm_modgrade extends MoodleQuickForm_group { '[modgrade_rescalegrades]', 'eq', ''); // A constant value should be given as an int. - // The default value should be an int and should really be $CFG->gradepointdefault. + // The default value should be an int and be either $CFG->gradepointdefault or whatever was set in set_data(). $value = $this->_findValue($caller->_constantValues); if (null === $value) { - if ($caller->isSubmitted()) { + if ($caller->isSubmitted() && $this->_findValue($caller->_submitValues) !== null) { + // Submitted values are array, one value for each individual element in this group. + // When there is submitted data let parent::onQuickFormEvent() process it. break; } $value = $this->_findValue($caller->_defaultValues);