From 9df20902b22049f0d780c0a956532052bd3050e8 Mon Sep 17 00:00:00 2001
From: Lene Wasskog <lene.wasskog@nibio.no>
Date: Wed, 30 Oct 2024 09:16:19 +0100
Subject: [PATCH] feat: Ensure model is not run if validation fails
---
.../templates/cerealblotchmodels/barleynetblotchform.html | 2 ++
.../templates/cerealblotchmodels/septoriahumiditymodelform.html | 1 +
2 files changed, 3 insertions(+)
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
index 7411d6a7..eb50a7b8 100755
--- a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
+++ b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
@@ -362,9 +362,11 @@
} else if (selectedWeatherdataType === "weatherstation") {
if(theForm["weatherStationId"].options[theForm["weatherStationId"].selectedIndex].value == "-1") {
alert("Mangler værstasjon")
+ return false;
}
} else {
alert("Mangler type værdatakilde")
+ return false;
}
// Observation: Either no fields or all fields must be set
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html b/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
index 2e29cd75..0645aacb 100644
--- a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
+++ b/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
@@ -430,6 +430,7 @@
}
} else {
alert("Mangler type værdatakilde")
+ return false;
}
return true;
}
--
GitLab