Commit 54a5dca8 authored by chirac's avatar chirac

Merge branch 'fix_radius_option_validation' into 'dev'

Fix radius options, force to set a vlan when adding a policy which requires it.

See merge request federez/re2o!392
parents 3443965e c92b6887
Pipeline #938 failed with stage
......@@ -231,6 +231,27 @@ class EditRadiusOptionForm(ModelForm):
model = RadiusOption
fields = '__all__'
def clean(self):
cleaned_data = super().clean()
ignored=('radius_general_policy', 'vlan_decision_ok')
fields = (
f for f in self.fields.keys()
if 'vlan' not in f and f not in ignored
)
for f in fields:
choice = cleaned_data.get(f)
vlan = cleaned_data.get(f+'_vlan')
if choice == RadiusOption.SET_VLAN and vlan is None:
self.add_error(
f,
_("You chose to set vlan but did not set any VLAN."),
)
self.add_error(
f+'_vlan',
_("Please, choose a VLAN."),
)
return cleaned_data
class ServiceForm(ModelForm):
"""Edition, ajout de services sur la page d'accueil"""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment