p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.6.x] Removed unused model option "admin" 

Backport of 5df84b268d from master
This commit is contained in:
Tim Graham 2013-08-01 10:27:30 -04:00
parent d32471f8c2
commit b3e54f4a01
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/db/models/options.py
View File

@ -41,7 +41,6 @@ class Options(object):
self.get_latest_by = None self.get_latest_by = None
self.order_with_respect_to = None self.order_with_respect_to = None
self.db_tablespace = settings.DEFAULT_TABLESPACE self.db_tablespace = settings.DEFAULT_TABLESPACE
self.admin = None
self.meta = meta self.meta = meta
self.pk = None self.pk = None
self.has_auto_field, self.auto_field = False, None self.has_auto_field, self.auto_field = False, None

5
docs/ref/models/options.txt
View File

@ -222,9 +222,8 @@ Django quotes column and table names behind the scenes.
.. attribute:: Options.permissions .. attribute:: Options.permissions
Extra permissions to enter into the permissions table when creating this object. Extra permissions to enter into the permissions table when creating this object.
Add, delete and change permissions are automatically created for each object Add, delete and change permissions are automatically created for each
that has ``admin`` set. This example specifies an extra permission, model. This example specifies an extra permission, ``can_deliver_pizzas``::
``can_deliver_pizzas``::
permissions = (("can_deliver_pizzas", "Can deliver pizzas"),) permissions = (("can_deliver_pizzas", "Can deliver pizzas"),)