7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-10-31 02:56:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #157 from EvanSung/fix_20230817_guser_issue

Browse Source 
fix(acl): g user issue
This commit is contained in:
pycook
2023-08-17 22:12:45 +08:00
committed by GitHub
parent 9b976675c0 d0d68c613b
commit a24ba8f7cd
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmdb-api/api/lib/perm/acl/audit.py
View File

@@ -49,9 +49,7 @@ class AuditCRUD(object):
@staticmethod @staticmethod
def get_current_operate_uid(uid=None): def get_current_operate_uid(uid=None):
user_id = uid or getattr(current_user, 'uid', None)
user_id = uid or (hasattr(g, 'user') and getattr(current_user, 'uid', None)) \
or getattr(current_user, 'user_id', None)
if has_request_context() and request.headers.get('X-User-Id'): if has_request_context() and request.headers.get('X-User-Id'):
_user_id = request.headers['X-User-Id'] _user_id = request.headers['X-User-Id']