Changeset 1420
- Timestamp:
- 11/24/05 20:26:08 (3 years ago)
- Files:
-
- django/branches/new-admin/django/bin/validate.py (modified) (3 diffs)
- django/trunk/django/bin/validate.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/new-admin/django/bin/validate.py
r982 r1420 15 15 if isinstance(f, meta.ManyToManyField): 16 16 assert isinstance(f.rel, meta.ManyToMany), \ 17 "ManyToManyField %s should have 'rel' set to a ManyToMany instance." % f.name17 "ManyToManyField %s should have 'rel' set to a ManyToMany instance." % f.name 18 18 # Inline related objects. 19 19 for related in opts.get_followed_related_objects(): 20 20 assert len([f for f in related.opts.fields if f.core]) > 0, \ 21 "At least one field in %s should have core=True, because it's being edited inline by %s." % \22 (related.opts.object_name, opts.object_name)21 "At least one field in %s should have core=True, because it's being edited inline by %s." % \ 22 (related.opts.object_name, opts.object_name) 23 23 # All related objects. 24 24 related_apps_seen = [] … … 26 26 if related.opts in related_apps_seen: 27 27 assert related.field.rel.related_name is not None, \ 28 "Relationship in field %s.%s needs to set 'related_name' because more than one" \29 " %s object is referenced in %s." % \30 (related.opts.object_name, related.field.name, opts.object_name, rel_opts.object_name)28 "Relationship in field %s.%s needs to set 'related_name' because more than one" \ 29 " %s object is referenced in %s." % \ 30 (related.opts.object_name, related.field.name, opts.object_name, rel_opts.object_name) 31 31 related_apps_seen.append(related.opts) 32 32 # Etc. … … 34 34 assert opts.admin.ordering or opts.ordering, \ 35 35 "%s needs to set 'ordering' on either its 'admin' or its model," \ 36 "because it has 'admin' set." % \ 37 opts.object_name 36 " because it has 'admin' set." % opts.object_name 38 37 39 38 if __name__ == "__main__": django/trunk/django/bin/validate.py
r3 r1420 14 14 for f in opts.fields: 15 15 if isinstance(f, meta.ManyToManyField): 16 assert isinstance(f.rel, meta.ManyToMany), "ManyToManyField %s should have 'rel' set to a ManyToMany instance." % f.name 16 assert isinstance(f.rel, meta.ManyToMany), \ 17 "ManyToManyField %s should have 'rel' set to a ManyToMany instance." % f.name 17 18 # Inline related objects. 18 19 for rel_opts, rel_field in opts.get_inline_related_objects(): 19 assert len([f for f in rel_opts.fields if f.core]) > 0, "At least one field in %s should have core=True, because it's being edited inline by %s." % (rel_opts.object_name, opts.object_name) 20 assert len([f for f in rel_opts.fields if f.core]) > 0, \ 21 "At least one field in %s should have core=True, because it's being edited inline by %s." % \ 22 (rel_opts.object_name, opts.object_name) 20 23 # All related objects. 21 24 related_apps_seen = [] 22 25 for rel_opts, rel_field in opts.get_all_related_objects(): 23 26 if rel_opts in related_apps_seen: 24 assert rel_field.rel.related_name is not None, "Relationship in field %s.%s needs to set 'related_name' because more than one %s object is referenced in %s." % (rel_opts.object_name, rel_field.name, opts.object_name, rel_opts.object_name) 27 assert rel_field.rel.related_name is not None, \ 28 "Relationship in field %s.%s needs to set 'related_name' because more than one" \ 29 " %s object is referenced in %s." % \ 30 (rel_opts.object_name, rel_field.name, opts.object_name, rel_opts.object_name) 25 31 related_apps_seen.append(rel_opts) 26 32 # Etc. 27 33 if opts.admin is not None: 28 assert opts.admin.ordering or opts.ordering, "%s needs to set 'ordering' on either its 'admin' or its model, because it has 'admin' set." % opts.object_name 34 assert opts.admin.ordering or opts.ordering, \ 35 "%s needs to set 'ordering' on either its 'admin' or its model," \ 36 " because it has 'admin' set." % opts.object_name 29 37 30 38 if __name__ == "__main__":
