github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 将 user 添加到 default 组织时进度数量显示不准确 (#5720) 

Co-authored-by: xinwen <coderWen@126.com>
pull/5722/head
fit2bot 2021-03-11 11:09:47 +08:00 committed by GitHub
parent b3991d0388
commit a45f581b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/orgs/migrations/0010_auto_20210219_1241.py
View File

@ -47,17 +47,18 @@ def add_all_user_to_default_org(apps, schema_editor):
User = apps.get_model('users', 'User') User = apps.get_model('users', 'User')
Organization = apps.get_model('orgs', 'Organization') Organization = apps.get_model('orgs', 'Organization')
users = User.objects.all() users_qs = User.objects.all()
default_org = Organization.objects.get(id=default_id) default_org = Organization.objects.get(id=default_id)
t_start = time.time() t_start = time.time()
count = users.count() count = users_qs.count()
print(f'{count} users to add') print(f'Will add users to default org: {count}')
batch_size = 1000 batch_size = 1000
for i in range(0, count, batch_size): for i in range(0, count, batch_size):
default_org.members.add(*users[i:i+batch_size]) users = list(users_qs[i:i + batch_size])
print(f'Add {i+1}-{i+batch_size} users') default_org.members.add(*users)
print(f'Add users to default org: {i+1}-{i+len(users)}')
interval = round((time.time() - t_start) * 1000, 2) interval = round((time.time() - t_start) * 1000, 2)
print(f'done, use {interval} ms') print(f'done, use {interval} ms')