From 60af7a4e62e4bf5f93f9d5fecfe3596cdfe9e38f Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 17 May 2022 17:50:40 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=81=A2=E5=A4=8D=20tickets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/conf.py | 2 ++ apps/jumpserver/settings/custom.py | 1 + apps/settings/api/public.py | 1 + 3 files changed, 4 insertions(+) diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index fa4a211d4..da5071026 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -387,6 +387,8 @@ class Config(dict): 'FTP_LOG_KEEP_DAYS': 200, 'CLOUD_SYNC_TASK_EXECUTION_KEEP_DAYS': 30, + 'TICKETS_ENABLED': True, + # 废弃的 'DEFAULT_ORG_SHOW_ALL_USERS': True, 'ORG_CHANGE_TO_URL': '', diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py index ecd710a2e..0e13f82ec 100644 --- a/apps/jumpserver/settings/custom.py +++ b/apps/jumpserver/settings/custom.py @@ -119,6 +119,7 @@ CHANGE_AUTH_PLAN_SECURE_MODE_ENABLED = CONFIG.CHANGE_AUTH_PLAN_SECURE_MODE_ENABL DATETIME_DISPLAY_FORMAT = '%Y-%m-%d %H:%M:%S' +TICKETS_ENABLED = CONFIG.TICKETS_ENABLED REFERER_CHECK_ENABLED = CONFIG.REFERER_CHECK_ENABLED CONNECTION_TOKEN_ENABLED = CONFIG.CONNECTION_TOKEN_ENABLED diff --git a/apps/settings/api/public.py b/apps/settings/api/public.py index b9076618d..c08e2f2b8 100644 --- a/apps/settings/api/public.py +++ b/apps/settings/api/public.py @@ -56,6 +56,7 @@ class PublicSettingApi(generics.RetrieveAPIView): # Performance "LOGIN_TITLE": self.get_login_title(), "LOGO_URLS": self.get_logo_urls(), + "TICKETS_ENABLED": settings.TICKETS_ENABLED, "HELP_DOCUMENT_URL": settings.HELP_DOCUMENT_URL, "HELP_SUPPORT_URL": settings.HELP_SUPPORT_URL, # Auth