perf: 修改授权中(资产/应用)系统用户字段不必填

pull/6803/head
Michael Bai 2021-09-10 12:53:51 +08:00 committed by Jiangjie.Bai
parent 7e6fa27719
commit fa81652de5
3 changed files with 27 additions and 2 deletions

View File

@ -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'),
),
]

View File

@ -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")
)

View File

@ -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: