Skip to content

Commit

Permalink
new-admin and trunk: Normalized spacing differences in bin/validate.p…
Browse files Browse the repository at this point in the history
…y between trunk and new-admin

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Nov 25, 2005
1 parent baba996 commit c60e323
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions django/bin/validate.py
Expand Up @@ -13,19 +13,27 @@ def validate_class(klass):
# Fields.
for f in opts.fields:
if isinstance(f, meta.ManyToManyField):
assert isinstance(f.rel, meta.ManyToMany), "ManyToManyField %s should have 'rel' set to a ManyToMany instance." % f.name
assert isinstance(f.rel, meta.ManyToMany), \
"ManyToManyField %s should have 'rel' set to a ManyToMany instance." % f.name
# Inline related objects.
for rel_opts, rel_field in opts.get_inline_related_objects():
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)
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)
# All related objects.
related_apps_seen = []
for rel_opts, rel_field in opts.get_all_related_objects():
if rel_opts in related_apps_seen:
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)
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)
related_apps_seen.append(rel_opts)
# Etc.
if opts.admin is not None:
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
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

if __name__ == "__main__":
import sys
Expand Down

0 comments on commit c60e323

Please sign in to comment.