Bach Dániel · @bachdaniel · Őry Máté · Őry Máté · Őry Máté · Bach Dániel
--- a/circle/firewall/fields.py
+++ b/circle/firewall/fields.py
 ipv6_template_re = re.compile(r'^(%\([abcd]\)[dxX]|[A-Za-z0-9:-])+$')
  
  
-class MACAddressFormField(fields.RegexField):
+class MACAddressFormField(forms.Field):
    default_error_messages = {
-        'invalid': _(u'Enter a valid MAC address.'),
+        'invalid': _(u'Enter a valid MAC address. %s'),
    }
  
-    def __init__(self, *args, **kwargs):
-        super(MACAddressFormField, self).__init__(mac_re, *args, **kwargs)
--- a/circle/firewall/fields.py
+++ b/circle/firewall/fields.py
+            return value
+
+        return EUI(value, dialect=MACAddressField.mac_custom)
+
    def get_internal_type(self):
        return 'CharField'
  
    def to_python(self, value):
-        if not mac_re.search(str(value)):
-            raise ValidationError(
-                MACAddressFormField.default_error_messages['invalid'])
-        return str(value)
+        return MACAddressField.from_str(value)
+
+    def get_db_prep_value(self, value, connection, prepared=False):
+        if not value or value == "":
--- a/circle/firewall/fields.py
+++ b/circle/firewall/fields.py
+
+    def get_db_prep_value(self, value, connection, prepared=False):
+        if not value or value == "":
+            return None
+
+        if isinstance(value, EUI):
+            return str(value)
+        return value
+
+    def value_to_string(self, obj):
+        value = self._get_val_from_obj(obj)
+        return str(self.get_prep_value(value))
+
+    def clean(self, value, model_instance):
+        value = super(MACAddressField, self).clean(value, model_instance)
+        return self.get_prep_value(value)