From 5df84b268de45fffd90930e6442eb511cba71f5f Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 1 Aug 2013 10:27:30 -0400 Subject: [PATCH] Removed unused model option "admin" --- django/db/models/options.py | 1 - docs/ref/models/options.txt | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/django/db/models/options.py b/django/db/models/options.py index dda15770e33..d072d67fb32 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -41,7 +41,6 @@ class Options(object): self.get_latest_by = None self.order_with_respect_to = None self.db_tablespace = settings.DEFAULT_TABLESPACE - self.admin = None self.meta = meta self.pk = None self.has_auto_field, self.auto_field = False, None diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt index d54af37e869..41baa8c106d 100644 --- a/docs/ref/models/options.txt +++ b/docs/ref/models/options.txt @@ -227,9 +227,8 @@ Django quotes column and table names behind the scenes. .. attribute:: Options.permissions Extra permissions to enter into the permissions table when creating this object. - Add, delete and change permissions are automatically created for each object - that has ``admin`` set. This example specifies an extra permission, - ``can_deliver_pizzas``:: + Add, delete and change permissions are automatically created for each + model. This example specifies an extra permission, ``can_deliver_pizzas``:: permissions = (("can_deliver_pizzas", "Can deliver pizzas"),)