Changeset 8682

Timestamp:

08/28/08 15:58:10 (3 months ago)

Author:

jacob

Message:

Fixed #8556: added a useful formfield to CommaSeparatedIntegerField. gkelly, mattmcc, and kratorius all contributed portions of this patch.

Files:

• django/trunk/django/contrib/admin/options.py (modified) (1 diff)
• django/trunk/django/contrib/admin/widgets.py (modified) (1 diff)
• 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/contrib/admin/options.py

@@ -93 +93 @@
-        if isinstance(db_field, models.IntegerField):
-            kwargs['widget'] = widgets.AdminIntegerFieldWidget
+            return db_field.formfield(**kwargs)
+
+        # For CommaSeparatedIntegerFields, add a custom CSS class.
+        if isinstance(db_field, models.CommaSeparatedIntegerField):
+            kwargs['widget'] = widgets.AdminCommaSeparatedIntegerFieldWidget
-            return db_field.formfield(**kwargs)
-

django/trunk/django/contrib/admin/widgets.py

@@ -237 +237 @@
-            final_attrs.update(attrs)
-        super(AdminIntegerFieldWidget, self).__init__(attrs=final_attrs)
+
+class AdminCommaSeparatedIntegerFieldWidget(forms.TextInput):
+    def __init__(self, attrs=None):
+        final_attrs = {'class': 'vCommaSeparatedIntegerField'}
+        if attrs is not None:
+            final_attrs.update(attrs)
+        super(AdminCommaSeparatedIntegerFieldWidget, self).__init__(attrs=final_attrs)

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

@@ -395 +395 @@
-# TODO: Maybe move this into contrib, because it's specialized.
-class CommaSeparatedIntegerField(CharField):
-
+
+
+
+
+
+
+
+
+
+
+
-
-ansi_date_re = re.compile(r'^\d{4}-\d{1,2}-\d{1,2}$')

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

@@ -98 +98 @@
-    def __unicode__(self):
-        return self.description
+
+class CommaSeparatedInteger(models.Model):
+    field = models.CommaSeparatedIntegerField(max_length=20)
+
+    def __unicode__(self):
+        return self.field
-
-__test__ = {'API_TESTS': """
@@ -1051 +1057 @@
-<script type="text/javascript" src="/some/form/javascript"></script>
-
+>>> class CommaSeparatedIntegerForm(ModelForm):
+...    class Meta:
+...        model = CommaSeparatedInteger
+
+>>> f = CommaSeparatedIntegerForm().fields['field']
+>>> f.clean('1,2,3')
+u'1,2,3'
+>>> f.clean('1a,2')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter only digits separated by commas.']
+>>> f.clean(',,,,') 
+u',,,,'
+>>> f.clean('1.2')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter only digits separated by commas.']
+>>> f.clean('1,a,2')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter only digits separated by commas.']
+>>> f.clean('1,,2')
+u'1,,2'
+>>> f.clean('1')
+u'1'
+
-"""}