From ffea2aef0213dca9fd33c78bfee527402967771f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Thu, 13 Aug 2020 13:40:35 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"fix(cmd=5Ffilter):=20=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E8=BF=87=E6=BB=A4=E5=99=A8=E5=94=AF=E4=B8=80=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E4=B8=BA=20name=20+=20org=5Fid=20(#4326)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 550107c4564748f0f38e6728c8c84bf95c179801.
---
 .../migrations/0052_auto_20200715_1535.py     | 22 -------------------
 apps/assets/models/cmd_filter.py              |  3 +--
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete 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
deleted file mode 100644
index 5903d635e..000000000
--- a/apps/assets/migrations/0052_auto_20200715_1535.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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 d7707115d..91febd40b 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, verbose_name=_("Name"))
+    name = models.CharField(max_length=64, unique=True, 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,7 +29,6 @@ class CommandFilter(OrgModelMixin):
         return self.name
 
     class Meta:
-        unique_together = [('org_id', 'name')]
         verbose_name = _("Command filter")