From 1630bbc8e5d41316dfb293b0a6dd791345b98ce6 Mon Sep 17 00:00:00 2001 From: Erhan Date: Fri, 19 May 2023 11:34:54 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20[#315]=20Displaying=20UUID=20and?= =?UTF-8?q?=20version=20of=20an=20objecttype=20in=20the=20admin=20interfac?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accounts/migrations/0001_initial.py | 1 - .../migrations/0002_auto_20201012_1522.py | 1 - .../migrations/0003_auto_20201223_1231.py | 1 - src/objects/api/validators.py | 1 - src/objects/core/admin.py | 1 + src/objects/core/migrations/0001_initial.py | 1 - .../migrations/0002_auto_20200518_1707.py | 1 - .../core/migrations/0003_objectrecord.py | 1 - .../migrations/0004_move_data_to_record.py | 1 - .../migrations/0005_remove_object_data.py | 1 - .../migrations/0006_auto_20200904_1402.py | 1 - .../migrations/0007_auto_20200904_1403.py | 1 - .../migrations/0008_objectrecord_correct.py | 1 - .../migrations/0009_objectrecord_version.py | 1 - .../migrations/0010_move_version_to_record.py | 1 - .../migrations/0011_remove_object_version.py | 1 - .../core/migrations/0012_objectrecord_uuid.py | 1 - .../migrations/0013_generate_record_uuids.py | 1 - .../migrations/0014_auto_20200915_1740.py | 1 - .../migrations/0015_objectrecord_geometry.py | 1 - .../migrations/0016_auto_20210111_1649.py | 1 - .../migrations/0017_auto_20210111_1653.py | 1 - .../migrations/0018_auto_20210113_1239.py | 1 - .../core/migrations/0019_fill_record_index.py | 1 - .../migrations/0020_auto_20210118_1117.py | 1 - .../migrations/0021_auto_20201222_1745.py | 1 - ...022_move_object_types_to_separate_model.py | 1 - .../0023_remove_object_object_type.py | 1 - .../migrations/0024_auto_20201222_1811.py | 1 - ...5_delete_objects_with_empty_object_type.py | 1 - .../migrations/0026_auto_20201222_1833.py | 1 - .../migrations/0027_auto_20211203_1209.py | 1 - .../migrations/0028_objecttype__version.py | 21 ++++++++++ src/objects/core/models.py | 10 +++++ src/objects/core/utils.py | 1 - src/objects/token/admin.py | 38 +++++++++++++++++-- src/objects/token/migrations/0001_initial.py | 1 - .../migrations/0002_auto_20201223_1231.py | 1 - .../migrations/0003_auto_20210312_1507.py | 1 - .../migrations/0004_auto_20210315_1537.py | 1 - .../migrations/0005_auto_20210623_1242.py | 1 - .../migrations/0006_auto_20210721_1543.py | 1 - .../0007_remove_permission_fields.py | 1 - .../migrations/0008_permission_fields.py | 1 - src/objects/utils/migration_operations.py | 1 - 45 files changed, 67 insertions(+), 44 deletions(-) create mode 100644 src/objects/core/migrations/0028_objecttype__version.py diff --git a/src/objects/accounts/migrations/0001_initial.py b/src/objects/accounts/migrations/0001_initial.py index a52df171..81d040b9 100644 --- a/src/objects/accounts/migrations/0001_initial.py +++ b/src/objects/accounts/migrations/0001_initial.py @@ -8,7 +8,6 @@ class Migration(migrations.Migration): - initial = True dependencies = [ diff --git a/src/objects/accounts/migrations/0002_auto_20201012_1522.py b/src/objects/accounts/migrations/0002_auto_20201012_1522.py index c5d0129c..d0143243 100644 --- a/src/objects/accounts/migrations/0002_auto_20201012_1522.py +++ b/src/objects/accounts/migrations/0002_auto_20201012_1522.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("accounts", "0001_initial"), ] diff --git a/src/objects/accounts/migrations/0003_auto_20201223_1231.py b/src/objects/accounts/migrations/0003_auto_20201223_1231.py index 1f25cccf..c9964d50 100644 --- a/src/objects/accounts/migrations/0003_auto_20201223_1231.py +++ b/src/objects/accounts/migrations/0003_auto_20201223_1231.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("accounts", "0002_auto_20201012_1522"), ] diff --git a/src/objects/api/validators.py b/src/objects/api/validators.py index b54859b6..a1f44ab7 100644 --- a/src/objects/api/validators.py +++ b/src/objects/api/validators.py @@ -116,7 +116,6 @@ def __call__(self, attrs): try: response = client.retrieve("objecttype", url=object_type.url) except ClientError as exc: - msg = f"Object type can not be retrieved: {exc.args[0]}" raise ValidationError(msg) diff --git a/src/objects/core/admin.py b/src/objects/core/admin.py index 415371ec..b51b4551 100644 --- a/src/objects/core/admin.py +++ b/src/objects/core/admin.py @@ -7,6 +7,7 @@ @admin.register(ObjectType) class ObjectTypeAdmin(admin.ModelAdmin): + list_display = ("_name", "uuid", "_version") readonly_fields = ("_name",) diff --git a/src/objects/core/migrations/0001_initial.py b/src/objects/core/migrations/0001_initial.py index 9d5d1d7e..dd093ccf 100644 --- a/src/objects/core/migrations/0001_initial.py +++ b/src/objects/core/migrations/0001_initial.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - initial = True dependencies = [] diff --git a/src/objects/core/migrations/0002_auto_20200518_1707.py b/src/objects/core/migrations/0002_auto_20200518_1707.py index 2cd939d0..51423efc 100644 --- a/src/objects/core/migrations/0002_auto_20200518_1707.py +++ b/src/objects/core/migrations/0002_auto_20200518_1707.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0001_initial"), ] diff --git a/src/objects/core/migrations/0003_objectrecord.py b/src/objects/core/migrations/0003_objectrecord.py index 547aff24..7093cc35 100644 --- a/src/objects/core/migrations/0003_objectrecord.py +++ b/src/objects/core/migrations/0003_objectrecord.py @@ -7,7 +7,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0002_auto_20200518_1707"), ] diff --git a/src/objects/core/migrations/0004_move_data_to_record.py b/src/objects/core/migrations/0004_move_data_to_record.py index 73346b77..86f38237 100644 --- a/src/objects/core/migrations/0004_move_data_to_record.py +++ b/src/objects/core/migrations/0004_move_data_to_record.py @@ -22,7 +22,6 @@ def move_data_from_record(apps, _): class Migration(migrations.Migration): - dependencies = [ ("core", "0003_objectrecord"), ] diff --git a/src/objects/core/migrations/0005_remove_object_data.py b/src/objects/core/migrations/0005_remove_object_data.py index c8b5c02f..e4394895 100644 --- a/src/objects/core/migrations/0005_remove_object_data.py +++ b/src/objects/core/migrations/0005_remove_object_data.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0004_move_data_to_record"), ] diff --git a/src/objects/core/migrations/0006_auto_20200904_1402.py b/src/objects/core/migrations/0006_auto_20200904_1402.py index 827feb3c..076d8cb4 100644 --- a/src/objects/core/migrations/0006_auto_20200904_1402.py +++ b/src/objects/core/migrations/0006_auto_20200904_1402.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0005_remove_object_data"), ] diff --git a/src/objects/core/migrations/0007_auto_20200904_1403.py b/src/objects/core/migrations/0007_auto_20200904_1403.py index ec1abae2..8b49d5c2 100644 --- a/src/objects/core/migrations/0007_auto_20200904_1403.py +++ b/src/objects/core/migrations/0007_auto_20200904_1403.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0006_auto_20200904_1402"), ] diff --git a/src/objects/core/migrations/0008_objectrecord_correct.py b/src/objects/core/migrations/0008_objectrecord_correct.py index 988a7c87..32d4ece2 100644 --- a/src/objects/core/migrations/0008_objectrecord_correct.py +++ b/src/objects/core/migrations/0008_objectrecord_correct.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0007_auto_20200904_1403"), ] diff --git a/src/objects/core/migrations/0009_objectrecord_version.py b/src/objects/core/migrations/0009_objectrecord_version.py index d0d92625..1a5de1ef 100644 --- a/src/objects/core/migrations/0009_objectrecord_version.py +++ b/src/objects/core/migrations/0009_objectrecord_version.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0008_objectrecord_correct"), ] diff --git a/src/objects/core/migrations/0010_move_version_to_record.py b/src/objects/core/migrations/0010_move_version_to_record.py index f29c6e04..ad07bec6 100644 --- a/src/objects/core/migrations/0010_move_version_to_record.py +++ b/src/objects/core/migrations/0010_move_version_to_record.py @@ -19,7 +19,6 @@ def move_version_from_record(apps, _): class Migration(migrations.Migration): - dependencies = [ ("core", "0009_objectrecord_version"), ] diff --git a/src/objects/core/migrations/0011_remove_object_version.py b/src/objects/core/migrations/0011_remove_object_version.py index 47bbd2df..c851dc6e 100644 --- a/src/objects/core/migrations/0011_remove_object_version.py +++ b/src/objects/core/migrations/0011_remove_object_version.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0010_move_version_to_record"), ] diff --git a/src/objects/core/migrations/0012_objectrecord_uuid.py b/src/objects/core/migrations/0012_objectrecord_uuid.py index 2931f6d8..25da3346 100644 --- a/src/objects/core/migrations/0012_objectrecord_uuid.py +++ b/src/objects/core/migrations/0012_objectrecord_uuid.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0011_remove_object_version"), ] diff --git a/src/objects/core/migrations/0013_generate_record_uuids.py b/src/objects/core/migrations/0013_generate_record_uuids.py index 04263208..5296b18b 100644 --- a/src/objects/core/migrations/0013_generate_record_uuids.py +++ b/src/objects/core/migrations/0013_generate_record_uuids.py @@ -11,7 +11,6 @@ def generate_record_uuids(apps, _): class Migration(migrations.Migration): - dependencies = [ ("core", "0012_objectrecord_uuid"), ] diff --git a/src/objects/core/migrations/0014_auto_20200915_1740.py b/src/objects/core/migrations/0014_auto_20200915_1740.py index 1e0afa73..079f8bff 100644 --- a/src/objects/core/migrations/0014_auto_20200915_1740.py +++ b/src/objects/core/migrations/0014_auto_20200915_1740.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0013_generate_record_uuids"), ] diff --git a/src/objects/core/migrations/0015_objectrecord_geometry.py b/src/objects/core/migrations/0015_objectrecord_geometry.py index bd4dc1c2..505a234f 100644 --- a/src/objects/core/migrations/0015_objectrecord_geometry.py +++ b/src/objects/core/migrations/0015_objectrecord_geometry.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0014_auto_20200915_1740"), ] diff --git a/src/objects/core/migrations/0016_auto_20210111_1649.py b/src/objects/core/migrations/0016_auto_20210111_1649.py index a5e4b4a5..64431059 100644 --- a/src/objects/core/migrations/0016_auto_20210111_1649.py +++ b/src/objects/core/migrations/0016_auto_20210111_1649.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0015_objectrecord_geometry"), ] diff --git a/src/objects/core/migrations/0017_auto_20210111_1653.py b/src/objects/core/migrations/0017_auto_20210111_1653.py index d43b3581..48f4062b 100644 --- a/src/objects/core/migrations/0017_auto_20210111_1653.py +++ b/src/objects/core/migrations/0017_auto_20210111_1653.py @@ -6,7 +6,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0016_auto_20210111_1649"), ] diff --git a/src/objects/core/migrations/0018_auto_20210113_1239.py b/src/objects/core/migrations/0018_auto_20210113_1239.py index 566c5a62..61937575 100644 --- a/src/objects/core/migrations/0018_auto_20210113_1239.py +++ b/src/objects/core/migrations/0018_auto_20210113_1239.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0017_auto_20210111_1653"), ] diff --git a/src/objects/core/migrations/0019_fill_record_index.py b/src/objects/core/migrations/0019_fill_record_index.py index 059a9604..8823d303 100644 --- a/src/objects/core/migrations/0019_fill_record_index.py +++ b/src/objects/core/migrations/0019_fill_record_index.py @@ -22,7 +22,6 @@ def fill_record_index(apps, _): class Migration(migrations.Migration): - dependencies = [ ("core", "0018_auto_20210113_1239"), ] diff --git a/src/objects/core/migrations/0020_auto_20210118_1117.py b/src/objects/core/migrations/0020_auto_20210118_1117.py index b54d7677..12b2cd4f 100644 --- a/src/objects/core/migrations/0020_auto_20210118_1117.py +++ b/src/objects/core/migrations/0020_auto_20210118_1117.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0019_fill_record_index"), ] diff --git a/src/objects/core/migrations/0021_auto_20201222_1745.py b/src/objects/core/migrations/0021_auto_20201222_1745.py index 21b3edad..5638ada9 100644 --- a/src/objects/core/migrations/0021_auto_20201222_1745.py +++ b/src/objects/core/migrations/0021_auto_20201222_1745.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("zgw_consumers", "0011_remove_service_extra"), ("core", "0020_auto_20210118_1117"), diff --git a/src/objects/core/migrations/0022_move_object_types_to_separate_model.py b/src/objects/core/migrations/0022_move_object_types_to_separate_model.py index a5f2e5c8..030504c3 100644 --- a/src/objects/core/migrations/0022_move_object_types_to_separate_model.py +++ b/src/objects/core/migrations/0022_move_object_types_to_separate_model.py @@ -68,7 +68,6 @@ def move_objecttypes_from_model(apps, _): class Migration(migrations.Migration): - dependencies = [ ("core", "0021_auto_20201222_1745"), ("zgw_consumers", "0011_remove_service_extra"), diff --git a/src/objects/core/migrations/0023_remove_object_object_type.py b/src/objects/core/migrations/0023_remove_object_object_type.py index 68a16dc8..e03dbf69 100644 --- a/src/objects/core/migrations/0023_remove_object_object_type.py +++ b/src/objects/core/migrations/0023_remove_object_object_type.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0022_move_object_types_to_separate_model"), ] diff --git a/src/objects/core/migrations/0024_auto_20201222_1811.py b/src/objects/core/migrations/0024_auto_20201222_1811.py index 2247ae8d..3485dad7 100644 --- a/src/objects/core/migrations/0024_auto_20201222_1811.py +++ b/src/objects/core/migrations/0024_auto_20201222_1811.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0023_remove_object_object_type"), ] diff --git a/src/objects/core/migrations/0025_delete_objects_with_empty_object_type.py b/src/objects/core/migrations/0025_delete_objects_with_empty_object_type.py index 149a867b..9a16a265 100644 --- a/src/objects/core/migrations/0025_delete_objects_with_empty_object_type.py +++ b/src/objects/core/migrations/0025_delete_objects_with_empty_object_type.py @@ -8,7 +8,6 @@ def remove_objects_with_empty_object_type(apps, _): class Migration(migrations.Migration): - dependencies = [ ("core", "0024_auto_20201222_1811"), ] diff --git a/src/objects/core/migrations/0026_auto_20201222_1833.py b/src/objects/core/migrations/0026_auto_20201222_1833.py index 58be7238..ae8e289b 100644 --- a/src/objects/core/migrations/0026_auto_20201222_1833.py +++ b/src/objects/core/migrations/0026_auto_20201222_1833.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0025_delete_objects_with_empty_object_type"), ] diff --git a/src/objects/core/migrations/0027_auto_20211203_1209.py b/src/objects/core/migrations/0027_auto_20211203_1209.py index c488d33c..d8f5b7b4 100644 --- a/src/objects/core/migrations/0027_auto_20211203_1209.py +++ b/src/objects/core/migrations/0027_auto_20211203_1209.py @@ -7,7 +7,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0026_auto_20201222_1833"), ] diff --git a/src/objects/core/migrations/0028_objecttype__version.py b/src/objects/core/migrations/0028_objecttype__version.py new file mode 100644 index 00000000..d2e352a6 --- /dev/null +++ b/src/objects/core/migrations/0028_objecttype__version.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.28 on 2023-06-06 10:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("core", "0027_auto_20211203_1209"), + ] + + operations = [ + migrations.AddField( + model_name="objecttype", + name="_version", + field=models.IntegerField( + blank=True, + help_text="Cached version of the objecttype retrieved from the Objecttype API", + null=True, + ), + ), + ] diff --git a/src/objects/core/models.py b/src/objects/core/models.py index 10894698..2c1825fa 100644 --- a/src/objects/core/models.py +++ b/src/objects/core/models.py @@ -27,6 +27,13 @@ class ObjectType(models.Model): max_length=100, help_text=_("Cached name of the objecttype retrieved from the Objecttype API"), ) + _version = models.IntegerField( + help_text=_( + "Cached version of the objecttype retrieved from the Objecttype API" + ), + null=True, + blank=True, + ) objects = ObjectTypeQuerySet.as_manager() @@ -51,6 +58,9 @@ def clean(self): if not self._name: self._name = object_type_data["name"] + if not self._version: + self._version = object_type_data["version"] + class Object(models.Model): uuid = models.UUIDField( diff --git a/src/objects/core/utils.py b/src/objects/core/utils.py index 6f09a0ff..710ae7d1 100644 --- a/src/objects/core/utils.py +++ b/src/objects/core/utils.py @@ -11,7 +11,6 @@ def check_objecttype(object_type, version, data): try: response = client.retrieve("objectversion", url=objecttype_version_url) except ClientError as exc: - msg = f"Object type version can not be retrieved: {exc.args[0]}" raise ValidationError(msg) diff --git a/src/objects/token/admin.py b/src/objects/token/admin.py index 47faf319..b2dd10ec 100644 --- a/src/objects/token/admin.py +++ b/src/objects/token/admin.py @@ -2,7 +2,7 @@ from django.contrib.admin.utils import unquote from objects.api.serializers import ObjectSerializer -from objects.core.models import ObjectType +from objects.core.models import ObjectRecord, ObjectType from objects.utils.admin import EditInlineAdminMixin from objects.utils.serializers import build_spec, get_field_names @@ -14,7 +14,23 @@ @admin.register(Permission) class PermissionAdmin(admin.ModelAdmin): - list_display = ("token_auth", "object_type", "mode", "use_fields") + list_display = ( + "token_auth", + "object_type", + "get_uuid", + "get_version", + "mode", + "use_fields", + ) + + def get_uuid(self, obj): + return obj.object_type.uuid + + def get_version(self, obj): + return obj.object_type._version + + get_version.short_description = "Version" + get_uuid.short_description = "UUID" def get_object_fields(self): object_serializer = ObjectSerializer() @@ -104,7 +120,23 @@ def add_view(self, request, form_url="", extra_context=None): class PermissionInline(EditInlineAdminMixin, admin.TabularInline): model = Permission fk_name = "token_auth" - fields = ("object_type", "mode", "use_fields", "fields") + fields = ( + "object_type", + "get_uuid", + "get_version", + "mode", + "use_fields", + "fields", + ) + + def get_uuid(self, obj): + return obj.object_type.uuid + + def get_version(self, obj): + return obj.object_type._version + + get_version.short_description = "Version" + get_uuid.short_description = "UUID" @admin.register(TokenAuth) diff --git a/src/objects/token/migrations/0001_initial.py b/src/objects/token/migrations/0001_initial.py index d095e911..c9f955c0 100644 --- a/src/objects/token/migrations/0001_initial.py +++ b/src/objects/token/migrations/0001_initial.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - initial = True dependencies = [] diff --git a/src/objects/token/migrations/0002_auto_20201223_1231.py b/src/objects/token/migrations/0002_auto_20201223_1231.py index c3fb8427..4affa4b0 100644 --- a/src/objects/token/migrations/0002_auto_20201223_1231.py +++ b/src/objects/token/migrations/0002_auto_20201223_1231.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0026_auto_20201222_1833"), ("token", "0001_initial"), diff --git a/src/objects/token/migrations/0003_auto_20210312_1507.py b/src/objects/token/migrations/0003_auto_20210312_1507.py index 8fd50617..4da71fb2 100644 --- a/src/objects/token/migrations/0003_auto_20210312_1507.py +++ b/src/objects/token/migrations/0003_auto_20210312_1507.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("token", "0002_auto_20201223_1231"), ] diff --git a/src/objects/token/migrations/0004_auto_20210315_1537.py b/src/objects/token/migrations/0004_auto_20210315_1537.py index 23a03d5d..d9d38e19 100644 --- a/src/objects/token/migrations/0004_auto_20210315_1537.py +++ b/src/objects/token/migrations/0004_auto_20210315_1537.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("token", "0003_auto_20210312_1507"), ] diff --git a/src/objects/token/migrations/0005_auto_20210623_1242.py b/src/objects/token/migrations/0005_auto_20210623_1242.py index f65c39ae..b7a54a20 100644 --- a/src/objects/token/migrations/0005_auto_20210623_1242.py +++ b/src/objects/token/migrations/0005_auto_20210623_1242.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("token", "0004_auto_20210315_1537"), ] diff --git a/src/objects/token/migrations/0006_auto_20210721_1543.py b/src/objects/token/migrations/0006_auto_20210721_1543.py index c7d609d0..8ee32af9 100644 --- a/src/objects/token/migrations/0006_auto_20210721_1543.py +++ b/src/objects/token/migrations/0006_auto_20210721_1543.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("core", "0026_auto_20201222_1833"), ("token", "0005_auto_20210623_1242"), diff --git a/src/objects/token/migrations/0007_remove_permission_fields.py b/src/objects/token/migrations/0007_remove_permission_fields.py index ab9394c3..07428a01 100644 --- a/src/objects/token/migrations/0007_remove_permission_fields.py +++ b/src/objects/token/migrations/0007_remove_permission_fields.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("token", "0006_auto_20210721_1543"), ] diff --git a/src/objects/token/migrations/0008_permission_fields.py b/src/objects/token/migrations/0008_permission_fields.py index 2a224f1f..d4d14761 100644 --- a/src/objects/token/migrations/0008_permission_fields.py +++ b/src/objects/token/migrations/0008_permission_fields.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("token", "0007_remove_permission_fields"), ] diff --git a/src/objects/utils/migration_operations.py b/src/objects/utils/migration_operations.py index 6633cfc1..ba82e50e 100644 --- a/src/objects/utils/migration_operations.py +++ b/src/objects/utils/migration_operations.py @@ -45,7 +45,6 @@ def database_forwards(self, app_label, schema_editor, from_state, to_state) -> N if router.allow_migrate( schema_editor.connection.alias, app_label, **self.hints ): - base_sql = _get_reset_sql() with schema_editor.connection.cursor() as cursor: