rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-07-02 04:04:06 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_radius_option_validation' into 'dev'

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

See merge request federez/re2o!392
This commit is contained in:
chirac 2019-01-11 16:11:11 +01:00
parent 3443965e37 c92b68872e
commit 54a5dca858
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
preferences/forms.py
View file

@ -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"""