github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/3288/head
ibuler 2019-09-26 10:32:49 +08:00
parent 78aba7ae87 f87db2f4fc
commit 4b322fe9f6
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/assets/utils.py
View File

@ -54,10 +54,6 @@ class TreeService(Tree):
tree.init_assets() tree.init_assets()
return tree return tree
def init_assets_async(self):
t = threading.Thread(target=self.init_assets)
t.start()
def init_assets(self): def init_assets(self):
from orgs.utils import tmp_to_root_org from orgs.utils import tmp_to_root_org
self.all_nodes_assets_map = {} self.all_nodes_assets_map = {}

2
apps/orgs/views.py
View File

@ -17,7 +17,7 @@ class SwitchOrgView(DetailView):
oid = str(self.object.id) oid = str(self.object.id)
request.session['oid'] = oid request.session['oid'] = oid
host = request.get_host() host = request.get_host()
referer = request.META.get('HTTP_REFERER') referer = request.META.get('HTTP_REFERER', '')
if referer.find(host) == -1: if referer.find(host) == -1:
return redirect(reverse('index')) return redirect(reverse('index'))
if UUID_PATTERN.search(referer): if UUID_PATTERN.search(referer):

5
apps/perms/utils/asset_permission.py
View File

@ -158,9 +158,10 @@ class AssetPermissionUtilV2(AssetPermissionUtilCacheMixin):
@timeit @timeit
def filter_permissions(self, **filters): def filter_permissions(self, **filters):
filters_json = json.dumps(filters, sort_keys=True) self.cache_policy = '0'
# filters_json = json.dumps(filters, sort_keys=True)
self._permissions = self.permissions.filter(**filters) self._permissions = self.permissions.filter(**filters)
self._filter_id = md5(filters_json.encode()).hexdigest() # self._filter_id = md5(filters_json.encode()).hexdigest()
@lazyproperty @lazyproperty
def user_tree(self): def user_tree(self):