From 9488c8bd974ba6de4fae3f1c5bd2b96a0ee1eb67 Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 15 Jul 2020 20:04:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(cmd=5Ffilter):=20=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E5=94=AF=E4=B8=80=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E4=B8=BA=20name=20+=20org=5Fid=20(#4325)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0052_auto_20200715_1535.py | 22 +++++++++++++++++++ apps/assets/models/cmd_filter.py | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 apps/assets/migrations/0052_auto_20200715_1535.py diff --git a/apps/assets/migrations/0052_auto_20200715_1535.py b/apps/assets/migrations/0052_auto_20200715_1535.py new file mode 100644 index 000000000..5903d635e --- /dev/null +++ b/apps/assets/migrations/0052_auto_20200715_1535.py @@ -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')}, + ), + ] diff --git a/apps/assets/models/cmd_filter.py b/apps/assets/models/cmd_filter.py index 91febd40b..d7707115d 100644 --- a/apps/assets/models/cmd_filter.py +++ b/apps/assets/models/cmd_filter.py @@ -18,7 +18,7 @@ __all__ = [ class CommandFilter(OrgModelMixin): 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')) comment = models.TextField(blank=True, default='', verbose_name=_("Comment")) date_created = models.DateTimeField(auto_now_add=True) @@ -29,6 +29,7 @@ class CommandFilter(OrgModelMixin): return self.name class Meta: + unique_together = [('org_id', 'name')] verbose_name = _("Command filter")