mirror of https://github.com/jumpserver/jumpserver
parent
184e8b31e6
commit
b3991d0388
|
@ -65,8 +65,15 @@ def add_all_user_to_default_org(apps, schema_editor):
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('orgs', '0009_auto_20201023_1628'),
|
('tickets', '0007_auto_20201224_1821'),
|
||||||
|
('audits', '0011_userloginlog_backend'),
|
||||||
|
('ops', '0019_adhocexecution_celery_task_id'),
|
||||||
('perms', '0018_auto_20210208_1515'),
|
('perms', '0018_auto_20210208_1515'),
|
||||||
|
('applications', '0008_auto_20210104_0435'),
|
||||||
|
('terminal', '0031_auto_20210113_1356'),
|
||||||
|
('users', '0031_auto_20201118_1801'),
|
||||||
|
('assets', '0066_auto_20210208_1802'),
|
||||||
|
('orgs', '0009_auto_20201023_1628'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -54,6 +54,8 @@ def _find(attr):
|
||||||
|
|
||||||
def get_current_org():
|
def get_current_org():
|
||||||
org_id = get_current_org_id()
|
org_id = get_current_org_id()
|
||||||
|
if not org_id or org_id == Organization.ROOT_ID:
|
||||||
|
return Organization.root()
|
||||||
org = Organization.get_instance(org_id, default=Organization.root())
|
org = Organization.get_instance(org_id, default=Organization.root())
|
||||||
return org
|
return org
|
||||||
|
|
||||||
|
|
|
@ -76,6 +76,7 @@ def migrate_replay_storage(apps, schema_editor):
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
('settings', '0001_initial'),
|
||||||
('terminal', '0016_commandstorage_replaystorage'),
|
('terminal', '0016_commandstorage_replaystorage'),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue