From 8c12124559fe7d7fb35b39d5c7f814483b9f2527 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 31 Jan 2022 20:49:55 +0100 Subject: [PATCH 3/6] django_rbac: add missing constraints (#57500) --- .../migrations/0007_add_unique_constraints.py | 26 +++++++++++++++++++ src/django_rbac/models.py | 8 +++--- 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 src/django_rbac/migrations/0007_add_unique_constraints.py diff --git a/src/django_rbac/migrations/0007_add_unique_constraints.py b/src/django_rbac/migrations/0007_add_unique_constraints.py new file mode 100644 index 00000000..c6955427 --- /dev/null +++ b/src/django_rbac/migrations/0007_add_unique_constraints.py @@ -0,0 +1,26 @@ +# Generated by Django 2.2.23 on 2022-01-31 13:10 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('django_rbac', '0006_remove_operation_name'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='permission', + unique_together={('operation', 'ou', 'target_ct', 'target_id')}, + ), + migrations.AlterUniqueTogether( + name='roleparenting', + unique_together={('parent', 'child', 'direct')}, + ), + migrations.AlterIndexTogether( + name='roleparenting', + index_together={('child', 'parent', 'direct')}, + ), + ] diff --git a/src/django_rbac/models.py b/src/django_rbac/models.py index 399b5f7d..2080a224 100644 --- a/src/django_rbac/models.py +++ b/src/django_rbac/models.py @@ -83,7 +83,7 @@ class OrganizationalUnitAbstractBase(AbstractBase): class OrganizationalUnit(OrganizationalUnitAbstractBase): - class Meta: + class Meta(OrganizationalUnitAbstractBase.Meta): verbose_name = _('organizational unit') verbose_name_plural = _('organizational units') swappable = constants.RBAC_OU_MODEL_SETTING @@ -168,7 +168,7 @@ class PermissionAbstractBase(models.Model): class Permission(PermissionAbstractBase): - class Meta: + class Meta(PermissionAbstractBase.Meta): swappable = constants.RBAC_PERMISSION_MODEL_SETTING verbose_name = _('permission') verbose_name_plural = _('permissions') @@ -229,7 +229,7 @@ class RoleAbstractBase(AbstractOrganizationalUnitScopedBase, AbstractBase): class Role(RoleAbstractBase): - class Meta: + class Meta(RoleAbstractBase.Meta): verbose_name = _('role') verbose_name_plural = _('roles') swappable = constants.RBAC_ROLE_MODEL_SETTING @@ -263,7 +263,7 @@ class RoleParentingAbstractBase(models.Model): class RoleParenting(RoleParentingAbstractBase): - class Meta: + class Meta(RoleParentingAbstractBase.Meta): verbose_name = _('role parenting relation') verbose_name_plural = _('role parenting relations') swappable = constants.RBAC_ROLE_PARENTING_MODEL_SETTING -- 2.34.1