github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修复工单迁移bug

pull/6745/head
feng626 2021-08-27 17:55:51 +08:00 committed by Jiangjie.Bai
parent d1be4a136e
commit ae80797ce4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/tickets/const.py
View File

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

4
apps/tickets/migrations/0010_auto_20210812_1618.py
View File

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