Ticket #10686: permission_inheritance.diff

django/db/models/base.py

@@ -43 +43 @@
             meta = getattr(new_class, 'Meta', None)
         else:
             meta = attr_meta
+            # Append any inherited permissions to any explicitly declared ones.
+            if hasattr(meta, 'permissions') and getattr(meta, 'inherit_permissions', True):
+                if hasattr(new_class, 'Meta') and hasattr(new_class.Meta, 'permissions'):
+                    meta.permissions += new_class.Meta.permissions
         base_meta = getattr(new_class, '_meta', None)
 
         if getattr(meta, 'app_label', None) is None:

django/db/models/options.py

@@ -21 +21 @@
 DEFAULT_NAMES = ('verbose_name', 'db_table', 'ordering',
                  'unique_together', 'permissions', 'get_latest_by',
                  'order_with_respect_to', 'app_label', 'db_tablespace',
-                 'abstract', 'managed', 'proxy')
+                 'abstract', 'managed', 'proxy', 'inherit_permissions')
 
 class Options(object):
     def __init__(self, meta, app_label=None):
@@ -86 +86 @@
             if ut and not isinstance(ut[0], (tuple, list)):
                 ut = (ut,)
             setattr(self, 'unique_together', ut)
+            
+            # check for the %(class)s escape used for inherited permissions.
+            # If present, replace it with the appropriate text based off of
+            # the class name for both the name and codename of the permission.
+            perms = meta_attrs.pop('permissions', getattr(self, 'permissions'))
+            translated_perms = ()
+            if perms:
+                for codename, name in perms:
+                    codename = codename % {'class': cls.__name__.lower()}
+                    name = name % {'class': getattr(self, 'verbose_name')}
+                    translated_perms += ((codename, name),)
+            setattr(self, 'permissions', translated_perms)
 
             # verbose_name_plural is a special case because it uses a 's'
             # by default.

AUTHORS

@@ -26 +26 @@
     ajs <adi@sieker.info>
     alang@bright-green.com
     Marty Alchin <gulopine@gamemusic.org>
+    Forrest Aldridge <forrest.aldridge@gmail.com>
     Ahmad Alhashemi <trans@ahmadh.com>
     Daniel Alves Barbosa de Oliveira Vaz <danielvaz@gmail.com>
     AgarFu <heaven@croasanaso.sytes.net>