From 0b67c7a9539b1537ab9794936ea6f18fa03d1cc6 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Sat, 23 Oct 2021 16:12:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB=E9=99=86?= =?UTF-8?q?=E5=A4=8D=E5=90=88acl=E6=97=B6=20=E6=9C=AA=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=A7=84=E5=88=99bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/acls/migrations/0002_auto_20210926_1047.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/acls/migrations/0002_auto_20210926_1047.py b/apps/acls/migrations/0002_auto_20210926_1047.py index 05e0e7cf1..fa45cd25a 100644 --- a/apps/acls/migrations/0002_auto_20210926_1047.py +++ b/apps/acls/migrations/0002_auto_20210926_1047.py @@ -7,6 +7,8 @@ from acls.models import LoginACL LOGIN_CONFIRM_ZH = '登录复核' LOGIN_CONFIRM_EN = 'Login confirm' +DEFAULT_TIME_PERIODS = [{'id': i, 'value': '00:00~00:00'} for i in range(7)] + def has_zh(name: str) -> bool: for i in name: @@ -31,7 +33,8 @@ def migrate_login_confirm(apps, schema_editor): 'user': user, 'name': f'{user.name}-{login_confirm} ({date_created})', 'created_by': instance.created_by, - 'action': LoginACL.ActionChoices.confirm + 'action': LoginACL.ActionChoices.confirm, + 'rules': {'ip_group': ['*'], 'time_period': DEFAULT_TIME_PERIODS} } instance = login_acl_model.objects.create(**data) instance.reviewers.set(reviewers) @@ -39,11 +42,10 @@ def migrate_login_confirm(apps, schema_editor): def migrate_ip_group(apps, schema_editor): login_acl_model = apps.get_model("acls", "LoginACL") - default_time_periods = [{'id': i, 'value': '00:00~00:00'} for i in range(7)] updates = list() with transaction.atomic(): for instance in login_acl_model.objects.exclude(action=LoginACL.ActionChoices.confirm): - instance.rules = {'ip_group': instance.ip_group, 'time_period': default_time_periods} + instance.rules = {'ip_group': instance.ip_group, 'time_period': DEFAULT_TIME_PERIODS} updates.append(instance) login_acl_model.objects.bulk_update(updates, ['rules', ])