From a2a43b66b4a394bd8683178584e2241419125483 Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:43:22 -0700 Subject: [PATCH] Fix lint errors --- src/registrar/admin.py | 5 +++++ src/registrar/models/__init__.py | 2 +- src/registrar/models/domain_group.py | 12 +++--------- src/registrar/models/suborganization.py | 1 + 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index c0f52c696..b1dcb1f6e 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -2655,6 +2655,7 @@ class WaffleFlagAdmin(FlagAdmin): model = models.WaffleFlag fields = "__all__" + class DomainGroupResource(resources.ModelResource): """defines how each field in the referenced model should be mapped to the corresponding fields in the import/export file""" @@ -2662,10 +2663,12 @@ class DomainGroupResource(resources.ModelResource): class Meta: model = models.DomainGroup + class DomainGroupAdmin(ListHeaderAdmin, ImportExportModelAdmin): resource_classes = [DomainGroupResource] list_display = ["name", "portfolio"] + class SuborganizationResource(resources.ModelResource): """defines how each field in the referenced model should be mapped to the corresponding fields in the import/export file""" @@ -2673,10 +2676,12 @@ class SuborganizationResource(resources.ModelResource): class Meta: model = models.Suborganization + class SuborganizationAdmin(ListHeaderAdmin, ImportExportModelAdmin): resource_classes = [SuborganizationResource] list_display = ["name", "portfolio"] + admin.site.unregister(LogEntry) # Unregister the default registration admin.site.register(LogEntry, CustomLogEntryAdmin) diff --git a/src/registrar/models/__init__.py b/src/registrar/models/__init__.py index 2af89ce00..376739826 100644 --- a/src/registrar/models/__init__.py +++ b/src/registrar/models/__init__.py @@ -41,7 +41,7 @@ __all__ = [ "WaffleFlag", "Portfolio", "DomainGroup", - "Suborganization" + "Suborganization", ] auditlog.register(Contact) diff --git a/src/registrar/models/domain_group.py b/src/registrar/models/domain_group.py index f43627251..7f77cdc16 100644 --- a/src/registrar/models/domain_group.py +++ b/src/registrar/models/domain_group.py @@ -19,15 +19,9 @@ class DomainGroup(TimeStampedModel): help_text="Domain group", ) - portfolio = models.ForeignKey( - "registrar.Portfolio", - on_delete=models.PROTECT - ) + portfolio = models.ForeignKey("registrar.Portfolio", on_delete=models.PROTECT) - domains = models.ManyToManyField( - "registrar.DomainInformation", - blank=True - ) + domains = models.ManyToManyField("registrar.DomainInformation", blank=True) def __str__(self) -> str: - return f"{self.name}" \ No newline at end of file + return f"{self.name}" diff --git a/src/registrar/models/suborganization.py b/src/registrar/models/suborganization.py index c90a76f27..c731c64b3 100644 --- a/src/registrar/models/suborganization.py +++ b/src/registrar/models/suborganization.py @@ -7,6 +7,7 @@ class Suborganization(TimeStampedModel): """ Suborganization under an organization (portfolio) """ + name = models.CharField( null=True, blank=True,