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 f791baa71..b793b9e5b 100644 Binary files a/apps/static/img/logo_text_white.png and b/apps/static/img/logo_text_white.png differ