diff --git a/apps/authentication/models.py b/apps/authentication/models.py index 5764e84c8..f4db736af 100644 --- a/apps/authentication/models.py +++ b/apps/authentication/models.py @@ -68,6 +68,7 @@ class LoginConfirmSetting(CommonModelMixin): def create_confirm_ticket(self, request=None): from tickets import const from tickets.models import Ticket + from orgs.models import Organization ticket_title = _('Login confirm') + ' {}'.format(self.user) ticket_meta = self.construct_confirm_ticket_meta(request) ticket_assignees = self.reviewers.all() @@ -75,6 +76,7 @@ class LoginConfirmSetting(CommonModelMixin): 'title': ticket_title, 'type': const.TicketTypeChoices.login_confirm.value, 'meta': ticket_meta, + 'org_id': Organization.ROOT_ID, } ticket = Ticket.objects.create(**data) ticket.assignees.set(ticket_assignees) diff --git a/apps/authentication/views/login.py b/apps/authentication/views/login.py index 2c86970d9..6b0e799b2 100644 --- a/apps/authentication/views/login.py +++ b/apps/authentication/views/login.py @@ -170,7 +170,7 @@ class UserLoginWaitConfirmView(TemplateView): if not ticket_id: ticket = None else: - ticket = get_object_or_none(Ticket, pk=ticket_id) + ticket = Ticket.all().filter(pk=ticket_id).first() context = super().get_context_data(**kwargs) if ticket: timestamp_created = datetime.datetime.timestamp(ticket.date_created)