Ticket #6637: 6637.diff

django/oldforms/__init__.py

@@ -972 +972 @@
 
 class PhoneNumberField(TextField):
     "A convenience FormField for validating phone numbers (e.g. '630-555-1234')"
-    def __init__(self, field_name, is_required=False, validator_list=None):
+    def __init__(self, field_name, max_length=None, is_required=False, validator_list=None):
         if validator_list is None: validator_list = []
         validator_list = [self.isValidPhone] + validator_list
         TextField.__init__(self, field_name, length=12, max_length=12,

django/db/models/fields/__init__.py

@@ -967 +967 @@
         defaults.update(kwargs)
         return super(NullBooleanField, self).formfield(**defaults)
 
-class PhoneNumberField(IntegerField):
+class PhoneNumberField(CharField):
+    
+    def __init__(self, *args, **kwargs):
+        kwargs['max_length'] = kwargs.get('max_length', 15)
+        CharField.__init__(self, *args, **kwargs)
+        
     def get_manipulator_field_objs(self):
         return [oldforms.PhoneNumberField]
 
@@ -981 +986 @@
         from django.contrib.localflavor.us.forms import USPhoneNumberField
         defaults = {'form_class': USPhoneNumberField}
         defaults.update(kwargs)
-        return super(PhoneNumberField, self).formfield(**defaults)
+        return super(CharField, self).formfield(**defaults)
 
 class PositiveIntegerField(IntegerField):
     def get_manipulator_field_objs(self):

django/contrib/localflavor/us/forms.py

@@ -35 +35 @@
             return u'%s-%s-%s' % (m.group(1), m.group(2), m.group(3))
         raise ValidationError(self.error_messages['invalid'])
 
+    def __init__(self, *args, **kwargs):
+        super(USPhoneNumberField, self).__init__(*args, **kwargs)
+        
 class USSocialSecurityNumberField(Field):
     """
     A United States Social Security number.

tests/regressiontests/model_fields/tests.py

@@ -1 @@
-"""
+from django.db import models
+
+class PhoneNumber(models.Model):
+    phone = models.PhoneNumberField(null=False, blank=True)
+    description = models.CharField(max_length=20)
+
+    def __unicode__(self):
+        return self.phone
+
+__test__ = {'API_TESTS': """   
 >>> from django.db.models.fields import *
 
 # DecimalField
@@ -15 +24 @@
 Traceback (most recent call last):
 ...
 ValidationError: [u'This value must be a decimal number.']
-"""
+
+# Make sure that a blank phone number can be saved.
+# See http://code.djangoproject.com/ticket/6637
+>>> p = PhoneNumber()
+>>> p.save()
+>>> PhoneNumber.objects.all()
+[<PhoneNumber: >]
+>>> p = PhoneNumber()
+>>> p.phone = "612-282-2573"
+>>> p.description = "Fake Phone Number"
+>>> p.save()
+>>> PhoneNumber.objects.all()
+[<PhoneNumber: >, <PhoneNumber: 612-282-2573>]
+"""}

AUTHORS

@@ -377 +377 @@
     ymasuda@ethercube.com
     Jarek Zgoda <jarek.zgoda@gmail.com>
     Cheng Zhang
+    Curtis Thompson <curtis.thompson@gmail.com>
 
 A big THANK YOU goes to: