From 5476d5ed1d5d4dd334b087f1f176ca34cbcd1f03 Mon Sep 17 00:00:00 2001 From: Nicolas Mounet Date: Wed, 2 Dec 2020 19:01:00 +0100 Subject: [PATCH] model_generator: raising error when window_type not specified with natural ventilation --- cara/apps/calculator/model_generator.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index 4dd7be70..bd2114d5 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -76,7 +76,12 @@ class FormData: if form_data[key] not in valid_set: raise ValueError(f"{form_data[key]} is not a valid value for {key}") - # Don't let arbirtrary unescaped HTML through the net. + if (form_data['ventilation_type'] == 'natural' and + form_data['window_type'] == 'not-applicable'): + raise ValueError("window_type cannot be ''not-applicable'' if " + "ventilation_type is ''natural''") + + # Don't let arbitrary unescaped HTML through the net. for key, value in form_data.items(): if isinstance(value, str): form_data[key] = html.escape(value)