mirror of https://github.com/jumpserver/jumpserver
fix: 资产登录被限制,没有记录到当前组织的操作日志,而是记录到全局组织 (#11827)
Co-authored-by: feng <1304903146@qq.com>pull/11834/head
parent
58fd578ddd
commit
7eb497f9d3
|
@ -22,6 +22,7 @@ from common.utils import random_string, get_logger, get_request_ip
|
||||||
from common.utils.django import get_request_os
|
from common.utils.django import get_request_os
|
||||||
from common.utils.http import is_true, is_false
|
from common.utils.http import is_true, is_false
|
||||||
from orgs.mixins.api import RootOrgViewMixin
|
from orgs.mixins.api import RootOrgViewMixin
|
||||||
|
from orgs.utils import tmp_to_org
|
||||||
from perms.models import ActionChoices
|
from perms.models import ActionChoices
|
||||||
from terminal.connect_methods import NativeClient, ConnectMethodUtil
|
from terminal.connect_methods import NativeClient, ConnectMethodUtil
|
||||||
from terminal.models import EndpointRule, Endpoint
|
from terminal.models import EndpointRule, Endpoint
|
||||||
|
@ -383,6 +384,7 @@ class ConnectionTokenViewSet(ExtraActionApiMixin, RootOrgViewMixin, JMSModelView
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _record_operate_log(acl, asset):
|
def _record_operate_log(acl, asset):
|
||||||
from audits.handler import create_or_update_operate_log
|
from audits.handler import create_or_update_operate_log
|
||||||
|
with tmp_to_org(asset.org_id):
|
||||||
after = {str(_('Assets')): str(asset)}
|
after = {str(_('Assets')): str(asset)}
|
||||||
object_name = acl._meta.object_name
|
object_name = acl._meta.object_name
|
||||||
resource_type = acl._meta.verbose_name
|
resource_type = acl._meta.verbose_name
|
||||||
|
|
Loading…
Reference in New Issue