Context Navigation

Ticket #17904: 17904.diff

File 17904.diff, 2.2 KB (added by Claude Paroz, 13 years ago)
Revert optimization of r16963

diff --git a/django/contrib/auth/management/__init__.py b/django/contrib/auth/management/__init__.py
index e792597..b516507 100644

                def create_permissions(app, created_models, verbosity, **kwargs):
     searched_perms = list()
     # The codenames and ctypes that should exist.
     ctypes = set()
     ctypes_for_models = ContentType.objects.get_for_models(*app_models)
     for klass, ctype in ctypes_for_models.iteritems():
+    for klass in app_models:
+        ctype = ContentType.objects.get_for_model(klass)
         ctypes.add(ctype)
         for perm in _get_all_permissions(klass._meta):
             searched_perms.append((ctype, perm))

diff --git a/tests/modeltests/proxy_models/models.py b/tests/modeltests/proxy_models/models.py
index c033117..49fd87d 100644

                class MyPerson(Person):
     class Meta:
         proxy = True
         ordering = ["name"]
+        permissions = (
+            ("display_users", "May display users information"),
+        )
     objects = SubManager()
     other = PersonManager()
-…
+               class Improvement(Issue):
 class ProxyImprovement(Improvement):
     class Meta:
+        proxy = True
+ No newline at end of file
+        proxy = True

diff --git a/tests/modeltests/proxy_models/tests.py b/tests/modeltests/proxy_models/tests.py
index b332103..738e0db 100644

                class ProxyModelTests(TestCase):
         resp = [p.name for p in OtherPerson._default_manager.all()]
         self.assertEqual(resp, ['barney', 'wilma'])
+    def test_permissions_created(self):
+        from django.contrib.auth.models import Permission
+        try:
+            Permission.objects.get(name="May display users information")
+        except Permission.DoesNotExist:
+            self.fail("The permission 'May display users information' has not been created")
     def test_proxy_model_signals(self):
         """
         Test save signals for proxy models