SAK-42535 - Format the grade input before attempting to validate sinc…

…e a double with no leading 0 fails validation (sakaiproject#7605)
bizzkriss · Dec 2, 2019 · 387aeee · 387aeee
1 parent 2e44b8b
commit 387aeee
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/actions/GradeUpdateAction.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/actions/GradeUpdateAction.java
@@ -133,17 +133,16 @@ public ActionResponse handleEvent(final JsonNode params, final AjaxRequestTarget
 
 		final String rawOldGrade = params.get("oldScore").textValue();
 		final String rawNewGrade = params.get("newScore").textValue();
+		final String oldGrade = FormatHelper.formatGradeFromUserLocale(rawOldGrade);
+		final String newGrade = FormatHelper.formatGradeFromUserLocale(rawNewGrade);
 
-		if (StringUtils.isNotBlank(rawNewGrade)
-				&& (!NumberUtil.isValidLocaleDouble(rawNewGrade) || FormatHelper.validateDouble(rawNewGrade) < 0)) {
+		if (StringUtils.isNotBlank(newGrade)
+				&& (!NumberUtil.isValidLocaleDouble(newGrade) || FormatHelper.validateDouble(newGrade) < 0)) {
 			target.add(page.updateLiveGradingMessage(page.getString("feedback.error")));
 
 			return new ArgumentErrorResponse("Grade not valid");
 		}
 
-		final String oldGrade = FormatHelper.formatGradeFromUserLocale(rawOldGrade);
-		final String newGrade = FormatHelper.formatGradeFromUserLocale(rawNewGrade);
-
 		final String assignmentId = params.get("assignmentId").asText();
 		final String studentUuid = params.get("studentId").asText();
 		final String categoryId = params.has("categoryId") ? params.get("categoryId").asText() : null;