mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-12 21:06:27 +00:00
Merge branch 'fix-mac-foireuse' into 'master'
Fix mac foireuse See merge request !8
This commit is contained in:
commit
e86e74fdd4
2 changed files with 3 additions and 10 deletions
|
@ -60,12 +60,6 @@ class EditInterfaceForm(ModelForm):
|
|||
if "machine" in self.fields:
|
||||
self.fields['machine'].queryset = Machine.objects.all().select_related('user')
|
||||
|
||||
def clean(self):
|
||||
data = super(EditInterfaceForm, self).clean()
|
||||
mac = str(self.data['mac_address'])
|
||||
if len(''.join(mac.replace("-",":").split(":"))) != 12:
|
||||
self.add_error('mac_address', "Format de la mac incorrect")
|
||||
|
||||
class AddInterfaceForm(EditInterfaceForm):
|
||||
class Meta(EditInterfaceForm.Meta):
|
||||
fields = ['ipv4','mac_address','type','details']
|
||||
|
|
|
@ -235,10 +235,9 @@ class Interface(models.Model):
|
|||
return str(EUI(self.mac_address, dialect=mac_bare)).lower()
|
||||
|
||||
def filter_macaddress(self):
|
||||
mac_address = str(EUI(self.mac_address))
|
||||
if mac_address:
|
||||
self.mac_address = mac_address
|
||||
else:
|
||||
try:
|
||||
self.mac_address = str(EUI(self.mac_address))
|
||||
except :
|
||||
raise ValidationError("La mac donnée est invalide")
|
||||
|
||||
def clean(self, *args, **kwargs):
|
||||
|
|
Loading…
Reference in a new issue