summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJoseph Kocherhans <joseph@jkocherhans.com>2007-09-15 19:37:12 +0000
committerJoseph Kocherhans <joseph@jkocherhans.com>2007-09-15 19:37:12 +0000
commit84fd07f097aac62ff1ede0b81757e4be8182ec24 (patch)
treeb1ac8d1bcc35c10c59fbd858798287764ddca714 /django
parent1413f02d847f5c75e22a96f07596a96fb22e8480 (diff)
newforms-admin: Removed Model code and tests related to inner Admin classes. They are no longer used.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6317 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/db/models/base.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py
index 92eb64f3d3..832aa9950a 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -170,15 +170,7 @@ class Model(object):
dispatcher.send(signal=signals.post_init, sender=self.__class__, instance=self)
def add_to_class(cls, name, value):
- if name == 'Admin':
- assert type(value) == types.ClassType, "%r attribute of %s model must be a class, not a %s object" % (name, cls.__name__, type(value))
- from django.contrib.admin.options import ModelAdmin
- # Dynamically create a new ModelAdmin class, which is a subclass
- # of both ModelAdmin and the 'class Admin' on this model. The
- # resulting class is same as if the 'class Admin' were a subclass
- # of ModelAdmin.
- cls._meta.admin = type('ModelAdmin', (value, ModelAdmin), {})
- elif hasattr(value, 'contribute_to_class'):
+ if hasattr(value, 'contribute_to_class'):
value.contribute_to_class(cls, name)
else:
setattr(cls, name, value)