Merge branch 'lina' of github.com:jumpserver/jumpserver into lina

apps/perms/apps.py

@@ -1,14 +1,7 @@
 from __future__ import unicode_literals
 
-from django.conf import settings
 from django.apps import AppConfig
 
 
 class PermsConfig(AppConfig):
     name = 'perms'
-
-    def ready(self):
-        from . import signals_handler
-        if not settings.XPACK_ENABLED:
-            settings.ASSETS_PERM_CACHE_ENABLE = False
-        return super().ready()

apps/perms/utils/asset_permission.py

@@ -302,7 +302,6 @@ class AssetPermissionUtil(AssetPermissionUtilCacheMixin):
                 continue
             ancestors = self.full_tree.ancestors(
                 child.identifier, with_self=False, deep=True,
-                with_assets=False,
             )
             # print("Get ancestors: {}".format(len(ancestors)))
             if not ancestors: