mirror of https://github.com/jumpserver/jumpserver
fix(cmd_filter): 命令过滤器唯一应该为 name + org_id (#4326)
parent
46ee7c4e04
commit
550107c456
|
@ -0,0 +1,22 @@
|
||||||
|
# Generated by Django 2.2.10 on 2020-07-15 07:35
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('assets', '0051_auto_20200713_1143'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='commandfilter',
|
||||||
|
name='name',
|
||||||
|
field=models.CharField(max_length=64, verbose_name='Name'),
|
||||||
|
),
|
||||||
|
migrations.AlterUniqueTogether(
|
||||||
|
name='commandfilter',
|
||||||
|
unique_together={('org_id', 'name')},
|
||||||
|
),
|
||||||
|
]
|
|
@ -18,7 +18,7 @@ __all__ = [
|
||||||
|
|
||||||
class CommandFilter(OrgModelMixin):
|
class CommandFilter(OrgModelMixin):
|
||||||
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
|
id = models.UUIDField(default=uuid.uuid4, primary_key=True)
|
||||||
name = models.CharField(max_length=64, unique=True, verbose_name=_("Name"))
|
name = models.CharField(max_length=64, verbose_name=_("Name"))
|
||||||
is_active = models.BooleanField(default=True, verbose_name=_('Is active'))
|
is_active = models.BooleanField(default=True, verbose_name=_('Is active'))
|
||||||
comment = models.TextField(blank=True, default='', verbose_name=_("Comment"))
|
comment = models.TextField(blank=True, default='', verbose_name=_("Comment"))
|
||||||
date_created = models.DateTimeField(auto_now_add=True)
|
date_created = models.DateTimeField(auto_now_add=True)
|
||||||
|
@ -29,6 +29,7 @@ class CommandFilter(OrgModelMixin):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
unique_together = [('org_id', 'name')]
|
||||||
verbose_name = _("Command filter")
|
verbose_name = _("Command filter")
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue