github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-25 14:32:05 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复工单翻译和登录确认工单开启问题

Browse Source
This commit is contained in:
Bai 2021-01-20 11:59:43 +08:00 committed by Jiangjie.Bai
parent ea16088c08
commit 7c55d462cd
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/authentication/models.py
View File

@ -69,17 +69,16 @@ class LoginConfirmSetting(CommonModelMixin):
from tickets import const from tickets import const
from tickets.models import Ticket from tickets.models import Ticket
ticket_title = _('Login confirm') + ' {}'.format(self.user) ticket_title = _('Login confirm') + ' {}'.format(self.user)
ticket_applicant = 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()
data = { data = {
'title': ticket_title, 'title': ticket_title,
'type': const.TicketTypeChoices.login_confirm.value, 'type': const.TicketTypeChoices.login_confirm.value,
'applicant': ticket_applicant,
'meta': ticket_meta, 'meta': ticket_meta,
} }
ticket = Ticket.objects.create(**data) ticket = Ticket.objects.create(**data)
ticket.assignees.set(ticket_assignees) ticket.assignees.set(ticket_assignees)
ticket.open(self.user)
return ticket return ticket
def __str__(self): def __str__(self):

2
apps/tickets/handler/base.py
View File

@ -59,7 +59,7 @@ class BaseHandler(object):
user_display = str(user) user_display = str(user)
action_display = self.ticket.get_action_display() action_display = self.ticket.get_action_display()
data = { data = {
'body': _('User {} {} the ticket'.format(user_display, action_display)), 'body': _('User {} {} the ticket').format(user_display, action_display),
'user': user, 'user': user,
'user_display': user_display 'user_display': user_display
} }