Changeset 7931

Timestamp:

07/15/08 20:02:57 (4 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #7771 -- Improved the validation check on the ordering field. Now takes '?' and 'field1field2' syntax into consideration. Thanks Michael Jung for catching this.

Files:

• django/branches/newforms-admin/django/contrib/admin/validation.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/modeladmin/models.py (modified) (2 diffs)

django/branches/newforms-admin/django/contrib/admin/validation.py

@@ -80 +80 @@
-                        "well. Please either remove `?` or the other fields."
-                        % cls.__name__)
+            if field == '?':
+                continue
-            if field.startswith('-'):
-                field = field[1:]
+            # Skip ordering in the format field1__field2 (FIXME: checking
+            # this format would be nice, but it's a little fiddly).
+            if '__' in field:
+                continue
-            _check_field_existsw('ordering[%d]' % idx, field)
-

django/branches/newforms-admin/tests/regressiontests/modeladmin/models.py

@@ -31 +31 @@
-    is_active = models.BooleanField()
-    pub_date = models.DateTimeField()
+    band = models.ForeignKey(Band)
-
-class ValidationTestInlineModel(models.Model):
@@ -612 +613 @@
-
->>> class ValidationTestModelAdmin(ModelAdmin):
+...     ordering = ('?',)
+>>> validate(ValidationTestModelAdmin, ValidationTestModel)
+
+>>> class ValidationTestModelAdmin(ModelAdmin):
+...     ordering = ('band__name',)
+>>> validate(ValidationTestModelAdmin, ValidationTestModel)
+
+>>> class ValidationTestModelAdmin(ModelAdmin):
-...     ordering = ('name',)
->>> validate(ValidationTestModelAdmin, ValidationTestModel)