github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修复用户登录复核工单org_id为ROOT

pull/5780/head
Bai 2021-03-17 14:17:53 +08:00 committed by Jiangjie.Bai
parent c55e2db75e
commit dfa2f7d6c9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/authentication/models.py
View File

@ -68,6 +68,7 @@ class LoginConfirmSetting(CommonModelMixin):
def create_confirm_ticket(self, request=None): def create_confirm_ticket(self, request=None):
from tickets import const from tickets import const
from tickets.models import Ticket from tickets.models import Ticket
from orgs.models import Organization
ticket_title = _('Login confirm') + ' {}'.format(self.user) ticket_title = _('Login confirm') + ' {}'.format(self.user)
ticket_meta = self.construct_confirm_ticket_meta(request) ticket_meta = self.construct_confirm_ticket_meta(request)
ticket_assignees = self.reviewers.all() ticket_assignees = self.reviewers.all()
@ -75,6 +76,7 @@ class LoginConfirmSetting(CommonModelMixin):
'title': ticket_title, 'title': ticket_title,
'type': const.TicketTypeChoices.login_confirm.value, 'type': const.TicketTypeChoices.login_confirm.value,
'meta': ticket_meta, 'meta': ticket_meta,
'org_id': Organization.ROOT_ID,
} }
ticket = Ticket.objects.create(**data) ticket = Ticket.objects.create(**data)
ticket.assignees.set(ticket_assignees) ticket.assignees.set(ticket_assignees)

2
apps/authentication/views/login.py
View File

@ -170,7 +170,7 @@ class UserLoginWaitConfirmView(TemplateView):
if not ticket_id: if not ticket_id:
ticket = None ticket = None
else: else:
ticket = get_object_or_none(Ticket, pk=ticket_id) ticket = Ticket.all().filter(pk=ticket_id).first()
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
if ticket: if ticket:
timestamp_created = datetime.datetime.timestamp(ticket.date_created) timestamp_created = datetime.datetime.timestamp(ticket.date_created)