github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-16 23:38:36 +00:00
Code Issues Projects Releases Wiki Activity

perf: 重构工单处理流程 (7)

Browse Source
This commit is contained in:
Bai
2021-01-13 17:36:05 +08:00
committed by Jiangjie.Bai
parent 64257823c5
commit 83d12d02fb
6 changed files with 28 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/tickets/handler/apply_application.py
View File

@@ -4,7 +4,6 @@ from applications.models import Application
from applications.const import ApplicationCategoryChoices, ApplicationTypeChoices
from assets.models import SystemUser
from perms.models import ApplicationPermission
from tickets.utils import convert_model_data_field_name_to_verbose_name
from .base import BaseHandler
@@ -26,22 +25,15 @@ class Handler(BaseHandler):
return meta_display
def _construct_meta_display_of_approve(self):
meta_display_fields = ['approve_applications_snapshot', 'approve_system_users_snapshot']
meta_display_fields = ['approve_applications_display', 'approve_system_users_display']
approve_applications_id = self.ticket.meta.get('approve_applications', [])
approve_system_users_id = self.ticket.meta.get('approve_system_users', [])
with tmp_to_org(self.ticket.org_id):
approve_applications_snapshot = list(
Application.objects.filter(id__in=approve_applications_id).values(
'name', 'category', 'type'
)
)
approve_system_users_snapshot = list(
SystemUser.objects.filter(id__in=approve_system_users_id).values(
'name', 'username', 'username_same_with_user', 'protocol',
'auto_push', 'sudo', 'home', 'sftp_root'
)
)
meta_display_values = [approve_applications_snapshot, approve_system_users_snapshot]
approve_applications = Application.objects.filter(id__in=approve_applications_id)
system_users = SystemUser.objects.filter(id__in=approve_system_users_id)
approve_applications_display = [str(application) for application in approve_applications]
approve_system_users_display = [str(system_user) for system_user in system_users]
meta_display_values = [approve_applications_display, approve_system_users_display]
meta_display = dict(zip(meta_display_fields, meta_display_values))
return meta_display
@@ -71,14 +63,8 @@ class Handler(BaseHandler):
def _construct_meta_body_of_approve(self):
# 审批信息
approve_applications_snapshot = self.ticket.meta.get('approve_applications_snapshot', [])
approve_applications_snapshot_display = convert_model_data_field_name_to_verbose_name(
model=Application, data=approve_applications_snapshot
)
approve_system_users_snapshot = self.ticket.meta.get('approve_system_users_snapshot', [])
approve_system_users_snapshot_display = convert_model_data_field_name_to_verbose_name(
model=SystemUser, data=approve_system_users_snapshot
)
approve_applications_display = self.ticket.meta.get('approve_applications_display', [])
approve_system_users_display = self.ticket.meta.get('approve_system_users_display', [])
approve_date_start = self.ticket.meta.get('approve_date_start')
approve_date_expired = self.ticket.meta.get('approve_date_expired')
approved_body = '''{}: {},
@@ -86,8 +72,8 @@ class Handler(BaseHandler):
{}: {},
{}: {},
'''.format(
__('Approved applications'), approve_applications_snapshot_display,
__('Approved system users'), approve_system_users_snapshot_display,
__('Approved applications'), approve_applications_display,
__('Approved system users'), approve_system_users_display,
__('Approved date start'), approve_date_start,
__('Approved date expired'), approve_date_expired
)

34
apps/tickets/handler/apply_asset.py
View File

@@ -4,7 +4,6 @@ from django.utils.translation import ugettext as __
from perms.models import AssetPermission, Action
from assets.models import Asset, SystemUser
from orgs.utils import tmp_to_org, tmp_to_root_org
from tickets.utils import convert_model_data_field_name_to_verbose_name
class Handler(BaseHandler):
@@ -24,26 +23,19 @@ class Handler(BaseHandler):
def _construct_meta_display_of_approve(self):
meta_display_fields = [
'approve_actions_display', 'approve_assets_snapshot', 'approve_system_users_snapshot'
'approve_actions_display', 'approve_assets_display', 'approve_system_users_display'
]
approve_actions = self.ticket.meta.get('approve_actions', Action.NONE)
approve_actions_display = Action.value_to_choices_display(approve_actions)
approve_assets_id = self.ticket.meta.get('approve_assets', [])
approve_system_users_id = self.ticket.meta.get('approve_system_users', [])
with tmp_to_org(self.ticket.org_id):
approve_assets_snapshot = list(
Asset.objects.filter(id__in=approve_assets_id).values(
'hostname', 'ip', 'protocols', 'platform__name', 'public_ip'
)
)
approve_system_users_snapshot = list(
SystemUser.objects.filter(id__in=approve_system_users_id).values(
'name', 'username', 'username_same_with_user', 'protocol',
'auto_push', 'sudo', 'home', 'sftp_root'
)
)
assets = Asset.objects.filter(id__in=approve_assets_id)
system_users = SystemUser.objects.filter(id__in=approve_system_users_id)
approve_assets_display = [str(asset) for asset in assets]
approve_system_users_display = [str(system_user) for system_user in system_users]
meta_display_values = [
approve_actions_display, approve_assets_snapshot, approve_system_users_snapshot
approve_actions_display, approve_assets_display, approve_system_users_display
]
meta_display = dict(zip(meta_display_fields, meta_display_values))
return meta_display
@@ -72,14 +64,8 @@ class Handler(BaseHandler):
return applied_body
def _construct_meta_body_of_approve(self):
approve_assets_snapshot = self.ticket.meta.get('approve_assets_snapshot', [])
approve_assets_snapshot_display = convert_model_data_field_name_to_verbose_name(
model=Asset, data=approve_assets_snapshot
)
approve_system_users_snapshot = self.ticket.meta.get('approve_system_users_snapshot', [])
approve_system_users_snapshot_display = convert_model_data_field_name_to_verbose_name(
model=SystemUser, data=approve_system_users_snapshot
)
approve_assets_display = self.ticket.meta.get('approve_assets_display', [])
approve_system_users_display = self.ticket.meta.get('approve_system_users_display', [])
approve_actions_display = self.ticket.meta.get('approve_actions_display', [])
approve_date_start = self.ticket.meta.get('approve_date_start')
approve_date_expired = self.ticket.meta.get('approve_date_expired')
@@ -89,8 +75,8 @@ class Handler(BaseHandler):
{}: {},
{}: {}
'''.format(
__('Approved assets'), approve_assets_snapshot_display,
__('Approved system users'), approve_system_users_snapshot_display,
__('Approved assets'), approve_assets_display,
__('Approved system users'), approve_system_users_display,
__('Approved actions'), ', '.join(approve_actions_display),
__('Approved date start'), approve_date_start,
__('Approved date expired'), approve_date_expired,