From fa81652de504c064f4e199718c22b9be6d688c7b Mon Sep 17 00:00:00 2001 From: Michael Bai Date: Fri, 10 Sep 2021 12:53:51 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E4=B8=AD(=E8=B5=84=E4=BA=A7/=E5=BA=94=E7=94=A8)=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0020_auto_20210910_1103.py | 24 +++++++++++++++++++ apps/perms/models/application_permission.py | 3 ++- apps/perms/models/asset_permission.py | 2 +- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 apps/perms/migrations/0020_auto_20210910_1103.py diff --git a/apps/perms/migrations/0020_auto_20210910_1103.py b/apps/perms/migrations/0020_auto_20210910_1103.py new file mode 100644 index 000000000..0d01345f5 --- /dev/null +++ b/apps/perms/migrations/0020_auto_20210910_1103.py @@ -0,0 +1,24 @@ +# Generated by Django 3.1.12 on 2021-09-10 03:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('assets', '0076_delete_assetuser'), + ('perms', '0019_auto_20210906_1044'), + ] + + operations = [ + migrations.AlterField( + model_name='assetpermission', + name='system_users', + field=models.ManyToManyField(blank=True, related_name='granted_by_permissions', to='assets.SystemUser', verbose_name='System user'), + ), + migrations.AlterField( + model_name='applicationpermission', + name='system_users', + field=models.ManyToManyField(blank=True, related_name='granted_by_application_permissions', to='assets.SystemUser', verbose_name='System user'), + ), + ] diff --git a/apps/perms/models/application_permission.py b/apps/perms/models/application_permission.py index a405e667c..40ac61ed8 100644 --- a/apps/perms/models/application_permission.py +++ b/apps/perms/models/application_permission.py @@ -27,7 +27,8 @@ class ApplicationPermission(BasePermission): verbose_name=_("Application") ) system_users = models.ManyToManyField( - 'assets.SystemUser', related_name='granted_by_application_permissions', + 'assets.SystemUser', + related_name='granted_by_application_permissions', blank=True, verbose_name=_("System user") ) diff --git a/apps/perms/models/asset_permission.py b/apps/perms/models/asset_permission.py index f763bee10..78e6b9b5b 100644 --- a/apps/perms/models/asset_permission.py +++ b/apps/perms/models/asset_permission.py @@ -98,7 +98,7 @@ class Action: class AssetPermission(BasePermission): assets = models.ManyToManyField('assets.Asset', related_name='granted_by_permissions', blank=True, verbose_name=_("Asset")) nodes = models.ManyToManyField('assets.Node', related_name='granted_by_permissions', blank=True, verbose_name=_("Nodes")) - system_users = models.ManyToManyField('assets.SystemUser', related_name='granted_by_permissions', verbose_name=_("System user")) + system_users = models.ManyToManyField('assets.SystemUser', related_name='granted_by_permissions', blank=True, verbose_name=_("System user")) actions = models.IntegerField(choices=Action.DB_CHOICES, default=Action.ALL, verbose_name=_("Actions")) class Meta: