mirror of https://github.com/jumpserver/jumpserver
Merge remote-tracking branch 'github/org' into org
commit
01bef95e6e
|
@ -7,5 +7,9 @@ class OpsConfig(AppConfig):
|
||||||
name = 'ops'
|
name = 'ops'
|
||||||
|
|
||||||
def ready(self):
|
def ready(self):
|
||||||
|
from orgs.models import Organization
|
||||||
|
from orgs.utils import set_current_org
|
||||||
|
set_current_org(Organization.root())
|
||||||
|
|
||||||
super().ready()
|
super().ready()
|
||||||
from .celery import signal_handler
|
from .celery import signal_handler
|
||||||
|
|
|
@ -263,7 +263,8 @@ class AdHoc(models.Model):
|
||||||
}
|
}
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
self._become = signer.sign(json.dumps(item)).decode('utf-8')
|
# self._become = signer.sign(json.dumps(item)).decode('utf-8')
|
||||||
|
self._become = signer.sign(json.dumps(item))
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def options(self):
|
def options(self):
|
||||||
|
|
|
@ -25,7 +25,7 @@ urlpatterns = [
|
||||||
path('tasks/kill-session/', api.KillSessionAPI.as_view(), name='kill-session'),
|
path('tasks/kill-session/', api.KillSessionAPI.as_view(), name='kill-session'),
|
||||||
path('terminal/<uuid:terminal>/access-key/', api.TerminalTokenApi.as_view(),
|
path('terminal/<uuid:terminal>/access-key/', api.TerminalTokenApi.as_view(),
|
||||||
name='terminal-access-key'),
|
name='terminal-access-key'),
|
||||||
path('terminal/config', api.TerminalConfig.as_view(), name='terminal-config'),
|
path('terminal/config/', api.TerminalConfig.as_view(), name='terminal-config'),
|
||||||
# v2: get session's replay
|
# v2: get session's replay
|
||||||
# path('v2/sessions/<uuid:pk>/replay/',
|
# path('v2/sessions/<uuid:pk>/replay/',
|
||||||
# api.SessionReplayV2ViewSet.as_view({'get': 'retrieve'}),
|
# api.SessionReplayV2ViewSet.as_view({'get': 'retrieve'}),
|
||||||
|
|
Loading…
Reference in New Issue