Ticket #9057: 9057.diff

tests/regressiontests/auth_permissions/tests.py

@@ +1 @@
+from django.utils import unittest
+
+from django.contrib.auth.models import Permission
+from django.contrib.contenttypes.models import ContentType
+
+class AuthPermissionsTest(unittest.TestCase):
+
+    def test_permissions(self):
+        self.assertEqual(Permission.objects.filter(content_type=
+                ContentType.objects.get_by_natural_key('auth_permissions', 'poll')
+            ).count(), 3)
+        self.assertEqual(Permission.objects.filter(content_type=
+                ContentType.objects.get_by_natural_key('auth_permissions', 'choice')
+            ).count(), 1)
+

tests/regressiontests/auth_permissions/models.py

@@ +1 @@
+from django.db import models
+
+class Poll(models.Model):
+    question = models.CharField(max_length=200)
+    pub_date = models.DateTimeField('date published')
+
+class Choice(models.Model):
+    poll = models.ForeignKey(Poll)
+    choice = models.CharField(max_length=200)
+    votes = models.IntegerField()
+
+    class Meta:
+        no_default_permissions = True
+        permissions = (
+            ("display_choices", "May display choices"),
+        )
+

django/db/models/options.py

@@ -15 +15 @@
 get_verbose_name = lambda class_name: re.sub('(((?<=[a-z])[A-Z])|([A-Z](?![A-Z]|$)))', ' \\1', class_name).lower().strip()
 
 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', 'auto_created')
+                 'unique_together', 'no_default_permissions', 'permissions', 
+                 'get_latest_by', 'order_with_respect_to', 'app_label', 
+                 'db_tablespace', 'abstract', 'managed', 'proxy', 'auto_created')
 
 class Options(object):
     def __init__(self, meta, app_label=None):
@@ -28 +28 @@
         self.db_table = ''
         self.ordering = []
         self.unique_together =  []
+        self.no_default_permissions = False
         self.permissions =  []
         self.object_name, self.app_label = None, app_label
         self.get_latest_by = None

django/contrib/auth/management/__init__.py

@@ -16 +16 @@
 def _get_all_permissions(opts):
     "Returns (codename, name) for all permissions in the given opts."
     perms = []
-    for action in ('add', 'change', 'delete'):
-        perms.append((_get_permission_codename(action, opts), u'Can %s %s' % (action, opts.verbose_name_raw)))
+    if not opts.no_default_permissions:
+        for action in ('add', 'change', 'delete'):
+            perms.append((_get_permission_codename(action, opts), u'Can %s %s' % (action, opts.verbose_name_raw)))
     return perms + list(opts.permissions)