From 88edc9191cc0292933cf510b1a10a895888f485e Mon Sep 17 00:00:00 2001 From: Bai Date: Thu, 2 Feb 2023 14:53:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=20ACL=20=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=20priority,=20date=5Fupdated,=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/acls/migrations/0008_commandgroup_comment.py | 6 +++--- apps/acls/models/base.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/acls/migrations/0008_commandgroup_comment.py b/apps/acls/migrations/0008_commandgroup_comment.py index 82e44912c..8937d2a93 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', 'date_updated', 'name'), 'verbose_name': 'Command acl'}, ), migrations.AlterModelOptions( name='loginacl', - options={'ordering': ('priority', 'name'), 'verbose_name': 'Login acl'}, + options={'ordering': ('priority', 'date_updated', 'name'), 'verbose_name': 'Login acl'}, ), migrations.AlterModelOptions( name='loginassetacl', - options={'ordering': ('priority', 'name'), 'verbose_name': 'Login asset acl'}, + options={'ordering': ('priority', 'date_updated', 'name'), 'verbose_name': 'Login asset acl'}, ), ] diff --git a/apps/acls/models/base.py b/apps/acls/models/base.py index 7ba48b3c6..53a566048 100644 --- a/apps/acls/models/base.py +++ b/apps/acls/models/base.py @@ -82,7 +82,7 @@ class BaseACL(JMSBaseModel): objects = ACLManager.from_queryset(BaseACLQuerySet)() class Meta: - ordering = ('priority', 'name') + ordering = ('priority', 'date_updated', 'name') abstract = True def is_action(self, action):