diff options
| author | Tim Graham <timograham@gmail.com> | 2013-08-01 10:27:30 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-08-01 12:33:19 -0400 |
| commit | b3e54f4a01dd410a87bc3d0669cb7b36aa74e7a8 (patch) | |
| tree | cefd76cb936dfcdfc0c7d96c8aa442fe8cf3da8b | |
| parent | d32471f8c276f19d69af6ba2531e42dac1e8d3e5 (diff) | |
[1.6.x] Removed unused model option "admin"
Backport of 5df84b268d from master
| -rw-r--r-- | django/db/models/options.py | 1 | ||||
| -rw-r--r-- | 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 ace8f37234..b37965ca4f 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 90099d13a3..6944796ef1 100644 --- a/docs/ref/models/options.txt +++ b/docs/ref/models/options.txt @@ -222,9 +222,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"),) |