add support for django 1.11 in Model.app_label (#21489)

src/authentic2/a2_rbac/models.py

@@ -3,7 +3,6 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.text import slugify
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
-from django.core.validators import RegexValidator
 
 from django_rbac.models import (RoleAbstractBase, PermissionAbstractBase,
                                 OrganizationalUnitAbstractBase, RoleParentingAbstractBase, VIEW_OP,
@@ -54,6 +53,7 @@ class OrganizationalUnit(OrganizationalUnitAbstractBase):
             ('name',),
             ('slug',),
         )
+        app_label = 'a2_rbac'
 
     def clean(self):
         # if we set this ou as the default one, we must unset the other one if
@@ -109,6 +109,7 @@ class Permission(PermissionAbstractBase):
     class Meta:
         verbose_name = _('permission')
         verbose_name_plural = _('permissions')
+        app_label = 'a2_rbac'
 
     mirror_roles = GenericRelation(rbac_utils.get_role_model_name(),
                                    content_type_field='admin_scope_ct',
@@ -208,6 +209,7 @@ class Role(RoleAbstractBase):
         unique_together = (
             ('admin_scope_ct', 'admin_scope_id'),
         )
+        app_label = 'a2_rbac'
 
     def natural_key(self):
         return [self.slug, self.ou and self.ou.natural_key(), self.service and
@@ -264,7 +266,7 @@ class RoleParenting(RoleParentingAbstractBase):
     class Meta(RoleParentingAbstractBase.Meta):
         verbose_name = _('role parenting relation')
         verbose_name_plural = _('role parenting relations')
-
+        app_label = 'a2_rbac'
 
 class RoleAttribute(models.Model):
     KINDS = (
@@ -290,6 +292,7 @@ class RoleAttribute(models.Model):
         unique_together = (
             ('role', 'name', 'kind', 'value'),
         )
+        app_label = 'a2_rbac'
 
     def to_json(self):
         return {'name': self.name, 'kind': self.kind, 'value': self.value}

src/django_rbac/models.py

@@ -94,6 +94,7 @@ class OrganizationalUnitAbstractBase(AbstractBase):
 
 class OrganizationalUnit(OrganizationalUnitAbstractBase):
     class Meta:
+        app_label = 'django_rbac'
         verbose_name = _('organizational unit')
         verbose_name_plural = _('organizational units')
         swappable = constants.RBAC_OU_MODEL_SETTING
@@ -118,14 +119,16 @@ class Operation(models.Model):
         return {'slug': self.slug, 'name': self.name}
 
     objects = managers.OperationManager()
-
+    
+    class Meta:
+        app_label = 'django_rbac'
 
 Operation._meta.natural_key = ['slug']
 
 
 class PermissionAbstractBase(models.Model):
     operation = models.ForeignKey(
-        to='Operation',
+        to=Operation,
         verbose_name=_('operation'))
     ou = models.ForeignKey(
         to=utils.get_ou_model_name(),
@@ -179,6 +182,7 @@ class PermissionAbstractBase(models.Model):
 
 class Permission(PermissionAbstractBase):
     class Meta:
+        app_label = 'django_rbac'
         swappable = constants.RBAC_PERMISSION_MODEL_SETTING
         verbose_name = _('permission')
         verbose_name_plural = _('permissions')
@@ -246,6 +250,7 @@ class RoleAbstractBase(AbstractOrganizationalUnitScopedBase, AbstractBase):
 
 class Role(RoleAbstractBase):
     class Meta:
+        app_label = 'django_rbac'
         verbose_name = _('role')
         verbose_name_plural = _('roles')
         swappable = constants.RBAC_ROLE_MODEL_SETTING
@@ -279,6 +284,7 @@ class RoleParentingAbstractBase(models.Model):
 
 class RoleParenting(RoleParentingAbstractBase):
     class Meta:
+        app_label = 'django_rbac'
         verbose_name = _('role parenting relation')
         verbose_name_plural = _('role parenting relations')
         swappable = constants.RBAC_ROLE_PARENTING_MODEL_SETTING