From 3c4cc10effd166d4aad5bf1e46923d4a4cf5c16e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Wed, 27 Jul 2016 16:22:12 +0200 Subject: [PATCH] MDL-55360 workshop: Emptying grades to pass should set them to zero When editing existing workshop with a grade to pass defined, when the field is emptied, it should be interpreted as setting it to zero. This was not happening because unformat_float replaces the field with null, therefore effectively unsetting it. By casting to float, we interpret all empty values (including null) as zeros. This behaviour is consistent with how gradebook setup UI works. --- mod/workshop/lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php index c9f40482f1d..07664a8f45b 100644 --- a/mod/workshop/lib.php +++ b/mod/workshop/lib.php @@ -82,11 +82,11 @@ function workshop_add_instance(stdclass $workshop) { $workshop->evaluation = 'best'; if (isset($workshop->gradinggradepass)) { - $workshop->gradinggradepass = unformat_float($workshop->gradinggradepass); + $workshop->gradinggradepass = (float)unformat_float($workshop->gradinggradepass); } if (isset($workshop->submissiongradepass)) { - $workshop->submissiongradepass = unformat_float($workshop->submissiongradepass); + $workshop->submissiongradepass = (float)unformat_float($workshop->submissiongradepass); } if (isset($workshop->submissionfiletypes)) { @@ -158,11 +158,11 @@ function workshop_update_instance(stdclass $workshop) { $workshop->phaseswitchassessment = (int)!empty($workshop->phaseswitchassessment); if (isset($workshop->gradinggradepass)) { - $workshop->gradinggradepass = unformat_float($workshop->gradinggradepass); + $workshop->gradinggradepass = (float)unformat_float($workshop->gradinggradepass); } if (isset($workshop->submissiongradepass)) { - $workshop->submissiongradepass = unformat_float($workshop->submissiongradepass); + $workshop->submissiongradepass = (float)unformat_float($workshop->submissiongradepass); } if (isset($workshop->submissionfiletypes)) {