From ae80797ce403fa8eb8cc9a50fe4c9867b2ee97ff Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Fri, 27 Aug 2021 17:55:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E8=BF=81=E7=A7=BBbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/tickets/const.py | 6 +++--- apps/tickets/migrations/0010_auto_20210812_1618.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/tickets/const.py b/apps/tickets/const.py index 328b8f36d..1d76ae487 100644 --- a/apps/tickets/const.py +++ b/apps/tickets/const.py @@ -44,7 +44,7 @@ class TicketApprovalLevel(IntegerChoices): class TicketApprovalStrategy(TextChoices): - super_admin = 'super_admin', _("Super admin user") - org_admin = 'org_admin', _("Org admin user") - super_org_admin = 'super_org_admin', _("Super org admin user") + super_admin = 'super_admin', _("Super admin") + org_admin = 'org_admin', _("Org admin") + super_org_admin = 'super_org_admin', _("Super admin and org admin") custom_user = 'custom_user', _("Custom user") diff --git a/apps/tickets/migrations/0010_auto_20210812_1618.py b/apps/tickets/migrations/0010_auto_20210812_1618.py index af357ab70..32a120889 100644 --- a/apps/tickets/migrations/0010_auto_20210812_1618.py +++ b/apps/tickets/migrations/0010_auto_20210812_1618.py @@ -106,8 +106,8 @@ class Migration(migrations.Migration): ('level', models.SmallIntegerField(choices=[(1, 'One level'), (2, 'Two level')], default=1, verbose_name='Approve level')), ('strategy', models.CharField( - choices=[('super', 'Super user'), ('admin', 'Admin user'), ('super_admin', 'Super admin user'), - ('custom', 'Custom user')], + choices=[('super_admin', 'Super admin'), ('org_admin', 'Org admin'), ('super_org_admin', 'Super admin and org admin'), + ('custom_user', 'Custom user')], default='super', max_length=64, verbose_name='Approve strategy')), ('assignees_display', models.JSONField(default=list, encoder=common.db.encoder.ModelJSONFieldEncoder, verbose_name='Assignees display')),