mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-04 02:48:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'core/master' into schema-alteration

Browse source 
Conflicts:
	django/db/models/options.py
This commit is contained in:
Andrew Godwin 2013-08-09 14:37:37 +01:00
commit 588b523233
7 changed files with 50 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
docs/ref/models/options.txt
View file

@ -235,6 +235,19 @@ Django quotes column and table names behind the scenes.
This is a list or tuple of 2-tuples in the format ``(permission_code,
human_readable_permission_name)``.
``default_permissions``
------------------------------
.. attribute:: Options.default_permissions
.. versionadded:: 1.7
Defaults to ``('add', 'change', 'delete')``. You may customize this list,
for example, by setting this to an empty list if your app doesn't require
any of the default permissions. It must be specified on the model before
the model is created by :djadmin:`syncdb` in order to prevent any omitted
permissions from being created.
``proxy``
---------