Ticket #10686: permission_inheritance.2.diff

AUTHORS

@@ -540 +540 @@
     Gasper Zejn <zejn@kiberpipa.org>
     Jarek Zgoda <jarek.zgoda@gmail.com>
     Cheng Zhang
+    Forrest Aldridge <forrest.aldridge@gmail.com>
 
 A big THANK YOU goes to:
 

django/db/models/base.py

@@ -44 +44 @@
             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):
+                all_perms = set(meta.permissions)
+                for parent in parents:
+                    if hasattr(parent, 'Meta') and hasattr(parent.Meta, 'permissions'):
+                        # De-dupe inherited permission in case the Meta class also inherited from another Meta 
+                        all_perms.update(parent.Meta.permissions)
+                meta.permissions = list(all_perms)
         base_meta = getattr(new_class, '_meta', None)
 
         if getattr(meta, 'app_label', None) is None:

django/db/models/options.py

@@ -17 +17 @@
 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')
+                 'abstract', 'managed', 'proxy', 'auto_created', 'inherit_permissions')
 
 class Options(object):
     def __init__(self, meta, app_label=None):
@@ -87 +87 @@
             if ut and not isinstance(ut[0], (tuple, list)):
                 ut = (ut,)
             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', self.permissions)
+            translated_perms = []
+            if perms:
+                for codename, name in perms:
+                    codename = codename % {'class': cls.__name__.lower()}
+                    name = name % {'class': self.verbose_name}
+                    translated_perms.append((codename, name),)
+            self.permissions = translated_perms
 
             # verbose_name_plural is a special case because it uses a 's'
             # by default.