From 403733e1d417ae2663ccb37fc2b6e9f422477b2f Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Sun, 19 May 2013 10:20:09 +0200 Subject: [PATCH] merge in @inglesp --- djadmin2/models.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/djadmin2/models.py b/djadmin2/models.py index 9d25c6a..60787d5 100644 --- a/djadmin2/models.py +++ b/djadmin2/models.py @@ -189,8 +189,7 @@ class ModelAdmin2(BaseAdmin2): # We set the application and instance namespace here return self.get_urls(), None, None - -def create_permissions(app, created_models, verbosity, **kwargs): +def create_extra_permissions(app, created_models, verbosity, **kwargs): """ Creates 'view' permissions for all models. django.contrib.auth only creates add, change and delete permissions. Since we also support read-only views, we need @@ -199,9 +198,6 @@ def create_permissions(app, created_models, verbosity, **kwargs): """ from django.contrib.contenttypes.models import ContentType - def _get_permission_codename(action, opts): - return u'%s_%s' % (action, opts.object_name.lower()) - app_models = get_models(app) # This will hold the permissions we're looking for as @@ -214,10 +210,10 @@ def create_permissions(app, created_models, verbosity, **kwargs): ctypes.add(ctype) opts = klass._meta - perm = (_get_permission_codename('view', opts), u'Can view %s' % opts.verbose_name_raw) + perm = ('view_%s' % opts.object_name.lower(), u'Can view %s' % opts.verbose_name_raw) searched_perms.append((ctype, perm)) - # Find all the Permissions that have a context_type for a model we're + # Find all the Permissions that have a content_type for a model we're # looking for. We don't need to check for codenames since we already have # a list of the ones we're going to create. all_perms = set(auth_app.Permission.objects.filter( @@ -226,16 +222,16 @@ def create_permissions(app, created_models, verbosity, **kwargs): "content_type", "codename" )) - objs = [ + perms = [ auth_app.Permission(codename=codename, name=name, content_type=ctype) for ctype, (codename, name) in searched_perms if (ctype.pk, codename) not in all_perms ] - auth_app.Permission.objects.bulk_create(objs) + auth_app.Permission.objects.bulk_create(perms) if verbosity >= 2: - for obj in objs: - print "Adding permission '%s'" % obj + for perm in perms: + print "Adding permission '%s'" % perm -signals.post_syncdb.connect(create_permissions, - dispatch_uid = "django-admin2.djadmin2.models.create_permissions") +signals.post_syncdb.connect(create_extra_permissions, + dispatch_uid = "django-admin2.djadmin2.models.create_extra_permissions")