Merge branch 'main' into release

Author: ewdurbin

sponsors/models/benefits.py

@@ -16,7 +16,7 @@
 
 ########################################
 # Benefit features abstract classes
-from sponsors.models.managers import BenefitFeatureQuerySet
+from sponsors.models.managers import BenefitFeatureQuerySet, BenefitFeatureConfigurationQuerySet
 
 
 ########################################
@@ -307,11 +307,14 @@ class BenefitFeatureConfiguration(PolymorphicModel):
     Base class for sponsorship benefits configuration.
     """
 
+    objects = BenefitFeatureQuerySet.as_manager()
     benefit = models.ForeignKey("sponsors.SponsorshipBenefit", on_delete=models.CASCADE)
+    non_polymorphic = models.Manager()
 
     class Meta:
         verbose_name = "Benefit Feature Configuration"
         verbose_name_plural = "Benefit Feature Configurations"
+        base_manager_name = 'non_polymorphic'
 
     @property
     def benefit_feature_class(self):

sponsors/models/managers.py

@@ -146,6 +146,15 @@ def provided_assets(self):
         return self.instance_of(*provided_assets_classes).select_related("sponsor_benefit__sponsorship")
 
 
+class BenefitFeatureConfigurationQuerySet(PolymorphicQuerySet):
+
+    def delete(self):
+        if not self.polymorphic_disabled:
+            return self.non_polymorphic().delete()
+        else:
+            return super().delete()
+
+
 class GenericAssetQuerySet(PolymorphicQuerySet):
 
     def all_assets(self):