From e92c82568db38f0b3268e7d8ab45bf25f7906aec Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 15 Jun 2023 10:45:07 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20acl=20=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/acls/migrations/0001_initial.py | 4 ++-- apps/acls/migrations/0002_auto_20210926_1047.py | 4 ++-- apps/acls/migrations/0003_auto_20211130_1037.py | 4 ++-- apps/acls/migrations/0006_commandfilteracl_commandgroup.py | 2 +- apps/acls/migrations/0008_commandgroup_comment.py | 6 +++--- apps/acls/migrations/0015_connectmethodacl.py | 2 +- apps/acls/migrations/0017_alter_connectmethodacl_options.py | 3 +-- apps/acls/models/base.py | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/apps/acls/migrations/0001_initial.py b/apps/acls/migrations/0001_initial.py index 378f33de3..3d314387b 100644 --- a/apps/acls/migrations/0001_initial.py +++ b/apps/acls/migrations/0001_initial.py @@ -38,7 +38,7 @@ class Migration(migrations.Migration): to=settings.AUTH_USER_MODEL, verbose_name='User')), ], options={ - 'ordering': ('priority', 'name'), + 'ordering': ('priority', '-is_active', 'name'), }, ), migrations.CreateModel( @@ -68,7 +68,7 @@ class Migration(migrations.Migration): verbose_name='Reviewers')), ], options={ - 'ordering': ('priority', 'name'), + 'ordering': ('priority', '-is_active', 'name'), 'unique_together': {('name', 'org_id')}, }, ), diff --git a/apps/acls/migrations/0002_auto_20210926_1047.py b/apps/acls/migrations/0002_auto_20210926_1047.py index a4af4bd69..f2019a613 100644 --- a/apps/acls/migrations/0002_auto_20210926_1047.py +++ b/apps/acls/migrations/0002_auto_20210926_1047.py @@ -89,10 +89,10 @@ class Migration(migrations.Migration): ), migrations.AlterModelOptions( name='loginacl', - options={'ordering': ('priority', 'name'), 'verbose_name': 'Login acl'}, + options={'ordering': ('priority', '-is_active', 'name'), 'verbose_name': 'Login acl'}, ), migrations.AlterModelOptions( name='loginassetacl', - options={'ordering': ('priority', 'name'), 'verbose_name': 'Login asset acl'}, + options={'ordering': ('priority', '-is_active', 'name'), 'verbose_name': 'Login asset acl'}, ), ] diff --git a/apps/acls/migrations/0003_auto_20211130_1037.py b/apps/acls/migrations/0003_auto_20211130_1037.py index cf32bca45..9a975c684 100644 --- a/apps/acls/migrations/0003_auto_20211130_1037.py +++ b/apps/acls/migrations/0003_auto_20211130_1037.py @@ -11,10 +11,10 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='loginacl', - options={'ordering': ('priority', 'name'), 'verbose_name': 'Login acl'}, + options={'ordering': ('priority', '-is_active', 'name'), 'verbose_name': 'Login acl'}, ), migrations.AlterModelOptions( name='loginassetacl', - options={'ordering': ('priority', 'name'), 'verbose_name': 'Login asset acl'}, + options={'ordering': ('priority', '-is_active', 'name'), 'verbose_name': 'Login asset acl'}, ), ] diff --git a/apps/acls/migrations/0006_commandfilteracl_commandgroup.py b/apps/acls/migrations/0006_commandfilteracl_commandgroup.py index 991efe556..3c1bd6793 100644 --- a/apps/acls/migrations/0006_commandfilteracl_commandgroup.py +++ b/apps/acls/migrations/0006_commandfilteracl_commandgroup.py @@ -63,7 +63,7 @@ class Migration(migrations.Migration): ], options={ 'verbose_name': 'Command acl', - 'ordering': ('priority', 'name'), + 'ordering': ('priority', '-is_active', 'name'), 'unique_together': {('name', 'org_id')}, }, ), diff --git a/apps/acls/migrations/0008_commandgroup_comment.py b/apps/acls/migrations/0008_commandgroup_comment.py index 82e44912c..0764daa22 100644 --- a/apps/acls/migrations/0008_commandgroup_comment.py +++ b/apps/acls/migrations/0008_commandgroup_comment.py @@ -20,14 +20,14 @@ class Migration(migrations.Migration): ), migrations.AlterModelOptions( name='commandfilteracl', - options={'ordering': ('priority', 'name'), 'verbose_name': 'Command acl'}, + options={'ordering': ('priority', '-is_active', 'name'), 'verbose_name': 'Command acl'}, ), migrations.AlterModelOptions( name='loginacl', - options={'ordering': ('priority', 'name'), 'verbose_name': 'Login acl'}, + options={'ordering': ('priority', '-is_active', 'name'), 'verbose_name': 'Login acl'}, ), migrations.AlterModelOptions( name='loginassetacl', - options={'ordering': ('priority', 'name'), 'verbose_name': 'Login asset acl'}, + options={'ordering': ('priority', '-is_active', 'name'), 'verbose_name': 'Login asset acl'}, ), ] diff --git a/apps/acls/migrations/0015_connectmethodacl.py b/apps/acls/migrations/0015_connectmethodacl.py index a786b87eb..5d5e3ff8c 100644 --- a/apps/acls/migrations/0015_connectmethodacl.py +++ b/apps/acls/migrations/0015_connectmethodacl.py @@ -39,7 +39,7 @@ class Migration(migrations.Migration): models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL, verbose_name='Reviewers')), ], options={ - 'ordering': ('priority', 'name'), + 'ordering': ('priority', '-is_active', 'name'), 'abstract': False, }, ), diff --git a/apps/acls/migrations/0017_alter_connectmethodacl_options.py b/apps/acls/migrations/0017_alter_connectmethodacl_options.py index 39132b450..6767771d6 100644 --- a/apps/acls/migrations/0017_alter_connectmethodacl_options.py +++ b/apps/acls/migrations/0017_alter_connectmethodacl_options.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('acls', '0016_auto_20230606_1857'), ] @@ -12,6 +11,6 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='connectmethodacl', - options={'ordering': ('priority', 'name'), 'verbose_name': 'Connect method acl'}, + options={'ordering': ('priority', '-is_active', 'name'), 'verbose_name': 'Connect method acl'}, ), ] diff --git a/apps/acls/models/base.py b/apps/acls/models/base.py index 6b7a5af37..cbc5c6e4e 100644 --- a/apps/acls/models/base.py +++ b/apps/acls/models/base.py @@ -51,7 +51,7 @@ class BaseACL(JMSBaseModel): objects = BaseACLQuerySet.as_manager() class Meta: - ordering = ('priority', 'name') + ordering = ('priority', '-is_active', 'name') abstract = True def is_action(self, action):