diff --git a/exhibition/api.py b/exhibition/api.py index abff880..260c581 100644 --- a/exhibition/api.py +++ b/exhibition/api.py @@ -385,12 +385,12 @@ def post(self, request, *args, **kwargs): # Authenticate the exhibitor try: exhibitor = ExhibitorInfo.objects.get(key=key) - settings = ExhibitorSettings.objects.get(event=exhibitor.event) - except (ExhibitorInfo.DoesNotExist, ExhibitorSettings.DoesNotExist): + except ExhibitorInfo.DoesNotExist: return Response( {"success": False, "error": "Invalid exhibitor key"}, status=status.HTTP_401_UNAUTHORIZED, ) + settings = ExhibitorSettings.objects.get_or_create(event=exhibitor.event)[0] # Get attendee details try: diff --git a/exhibition/forms.py b/exhibition/forms.py index 2815b8c..29cf4b5 100644 --- a/exhibition/forms.py +++ b/exhibition/forms.py @@ -140,7 +140,7 @@ class Meta: } def __init__(self, *args, **kwargs): - event = kwargs.pop("event", None) + event = kwargs.get("event") instance = kwargs.get("instance") super().__init__(*args, **kwargs) self.event = event or getattr(instance, "event", None) @@ -330,7 +330,7 @@ class Meta: } def __init__(self, *args, **kwargs): - event = kwargs.pop("event", None) + event = kwargs.get("event") super().__init__(*args, **kwargs) self.event = event or getattr(self.instance, "event", None)