github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-07 18:31:04 +00:00
Code Issues Projects Releases Wiki Activity

perf: 统一应用树 (#6535)

Browse Source 
* perf: 添加应用树api

* perf: perms tree

* perf: 统一应用树

* perf: 修改icon

* perf: stash it

* perf: 优化应用账号

* perf: 基本完成应用账号重构

* perf: 修改翻译

Co-authored-by: ibuler <ibuler@qq.com>
This commit is contained in:
fit2bot
2021-07-27 16:06:00 +08:00
committed by GitHub
parent d347ed9862
commit 905d0d5131
29 changed files with 626 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
from django.utils.translation import ugettext as _
from orgs.utils import tmp_to_org, tmp_to_root_org
from applications.models import Application
from applications.const import ApplicationCategoryChoices, ApplicationTypeChoices
from applications.const import AppCategory, AppType
from assets.models import SystemUser
from perms.models import ApplicationPermission
from .base import BaseHandler
@@ -17,9 +17,9 @@ class Handler(BaseHandler):
def _construct_meta_display_of_open(self):
meta_display_fields = ['apply_category_display', 'apply_type_display']
apply_category = self.ticket.meta.get('apply_category')
apply_category_display = ApplicationCategoryChoices.get_label(apply_category)
apply_category_display = AppCategory.get_label(apply_category)
apply_type = self.ticket.meta.get('apply_type')
apply_type_display = ApplicationTypeChoices.get_label(apply_type)
apply_type_display = AppType.get_label(apply_type)
meta_display_values = [apply_category_display, apply_type_display]
meta_display = dict(zip(meta_display_fields, meta_display_values))
return meta_display