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

fix g.user

Browse Source
This commit is contained in:
pycook
2023-08-21 11:54:33 +08:00
parent ece24080d5
commit 7547b67805
4 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ import json
from enum import Enum
from typing import List
from flask import g, has_request_context, request
from flask import has_request_context, request
from flask_login import current_user
from sqlalchemy import func
@@ -50,8 +50,7 @@ class AuditCRUD(object):
@staticmethod
def get_current_operate_uid(uid=None):
user_id = uid or (hasattr(g, 'user') and getattr(current_user, 'uid', None)) \
or getattr(current_user, 'user_id', None)
user_id = uid or (getattr(current_user, 'uid', None)) or getattr(current_user, 'user_id', None)
if has_request_context() and request.headers.get('X-User-Id'):
_user_id = request.headers['X-User-Id']