mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-05 08:10:36 +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

5
django/db/models/options.py
View file

@ -21,8 +21,8 @@ get_verbose_name = lambda class_name: re.sub('(((?<=[a-z])[A-Z])|([A-Z](?![A-Z]|
DEFAULT_NAMES = ('verbose_name', 'verbose_name_plural', 'db_table', 'ordering',
'unique_together', 'permissions', 'get_latest_by',
'order_with_respect_to', 'app_label', 'db_tablespace',
'abstract', 'managed', 'proxy', 'swappable', 'auto_created', 'index_together', 'app_cache')
'abstract', 'managed', 'proxy', 'swappable', 'auto_created',
'index_together', 'app_cache', 'default_permissions')
@python_2_unicode_compatible
class Options(object):
@ -35,6 +35,7 @@ class Options(object):
self.ordering = []
self.unique_together = []
self.index_together = []
self.default_permissions = ('add', 'change', 'delete')
self.permissions = []
self.object_name, self.app_label = None, app_label
self.get_latest_by = None