Changeset 4556

Timestamp:

02/20/07 23:59:46 (2 years ago)

Author:

adrian

Message:

Changed database PhoneNumberField? to use USPhoneNumberField as its newforms form field (instead of IntegerField?)

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (2 diffs)

django/trunk/django/db/models/fields/__init__.py

@@ -749 +749 @@
-        validators.isValidPhone(field_data, all_data)
-
+    def formfield(self, **kwargs):
+        from django.contrib.localflavor.usa.forms import USPhoneNumberField
+        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
+        defaults.update(kwargs)
+        return USPhoneNumberField(**defaults)
+
-class PositiveIntegerField(IntegerField):
-    def get_manipulator_field_objs(self):

django/trunk/tests/modeltests/model_forms/models.py

@@ -54 +54 @@
-    def __str__(self):
-        return self.headline
+
+class PhoneNumber(models.Model):
+    phone = models.PhoneNumberField()
+    description = models.CharField(maxlength=20)
+
+    def __str__(self):
+        return self.phone
-
-__test__ = {'API_TESTS': """
@@ -446 +453 @@
-...
-ValidationError: [u'Select a valid choice. 10 is not one of the available choices.']
+
+# PhoneNumberField ############################################################
+
+>>> PhoneNumberForm = form_for_model(PhoneNumber)
+>>> f = PhoneNumberForm({'phone': '(312) 555-1212', 'description': 'Assistance'})
+>>> f.is_valid()
+True
+>>> f.clean_data
+{'phone': u'312-555-1212', 'description': u'Assistance'}
-"""}