From ffa30fdb696af0dd6dc0f320c52b572b329e256a Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 23 Dec 2022 11:11:56 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20Logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/context_processor.py | 5 +---- apps/perms/urls/user_permission.py | 12 +++++++----- apps/static/img/logo_text_white.png | Bin 5027 -> 5767 bytes 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/jumpserver/context_processor.py b/apps/jumpserver/context_processor.py index 2a7c53e79..62464c6ad 100644 --- a/apps/jumpserver/context_processor.py +++ b/apps/jumpserver/context_processor.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # -from django.templatetags.static import static from django.conf import settings +from django.templatetags.static import static from django.utils.translation import ugettext_lazy as _ default_interface = dict(( @@ -37,6 +37,3 @@ def jumpserver_processor(request): 'SECURITY_VIEW_AUTH_NEED_MFA': settings.SECURITY_VIEW_AUTH_NEED_MFA, }) return context - - - diff --git a/apps/perms/urls/user_permission.py b/apps/perms/urls/user_permission.py index d15036ed5..63ed4f636 100644 --- a/apps/perms/urls/user_permission.py +++ b/apps/perms/urls/user_permission.py @@ -25,23 +25,25 @@ user_permission_urlpatterns = [ name='user-direct-assets-as-tree'), path('/ungroup/assets/tree/', api.UserUngroupAssetsAsTreeApi.as_view(), name='user-ungroup-assets-as-tree'), - # tree-node + + # tree-node,不包含资产 path('/nodes/tree/', api.UserAllPermedNodesAsTreeApi.as_view(), name='user-all-nodes-as-tree'), path('/nodes/children/tree/', api.UserPermedNodeChildrenAsTreeApi.as_view(), name='user-node-children-as-tree'), + # tree-node-with-asset # 异步树 path('/nodes/children-with-assets/tree/', api.UserPermedNodeChildrenWithAssetsAsTreeApi.as_view(), name='user-node-children-with-assets-as-tree'), + # 同步树 + path('/nodes/all-with-assets/tree/', + api.UserPermedNodesWithAssetsAsTreeApi.as_view(), + name='user-nodes-with-assets-as-tree'), path('/nodes/children-with-k8s/tree/', api.UserGrantedK8sAsTreeApi.as_view(), name='user-nodes-children-with-k8s-as-tree'), - - # 同步树 - path('/nodes-with-assets/tree/', api.UserPermedNodesWithAssetsAsTreeApi.as_view(), - name='user-nodes-with-assets-as-tree'), # accounts path('/assets//accounts/', api.UserPermedAssetAccountsApi.as_view(), name='user-permed-asset-accounts'), diff --git a/apps/static/img/logo_text_white.png b/apps/static/img/logo_text_white.png index f791baa71a2599846091805fc5c7027fe43857bf..b793b9e5be009f478fcf2a2159594dd38ac9230c 100644 GIT binary patch literal 5767 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 JtdqA4{|^CbEnWZs