chore: resolve conflict

apps/assets/migrations/0059_auto_20201027_1905.py

@@ -15,4 +15,9 @@ class Migration(migrations.Migration):
             name='protocol',
             field=models.CharField(choices=[('ssh', 'ssh'), ('rdp', 'rdp'), ('telnet', 'telnet'), ('vnc', 'vnc'), ('mysql', 'mysql'), ('oracle', 'oracle'), ('mariadb', 'mariadb'), ('postgresql', 'postgresql'), ('k8s', 'k8s')], default='ssh', max_length=16, verbose_name='Protocol'),
         ),
+        migrations.AddField(
+            model_name='systemuser',
+            name='ad_domain',
+            field=models.CharField(default='', max_length=256),
+        ),
     ]

apps/assets/migrations/0059_systemuser_ad_domain.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.13 on 2020-10-28 11:03
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0058_auto_20201023_1115'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='systemuser',
-            name='ad_domain',
-            field=models.CharField(default='', max_length=256),
-        ),
-    ]

apps/common/validators.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 from django.core.validators import RegexValidator
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 from rest_framework.validators import (
     UniqueTogetherValidator, ValidationError
 )

apps/perms/migrations/0016_applicationpermission.py

@@ -124,6 +124,9 @@ def migrate_and_integrate_application_permissions(apps, schema_editor):
         for old_perm in old_perms:
             if category == CATEGORY_REMOTE:
                 type_list = list(old_perm.remote_apps.values_list('type', flat=True))
+                if len(type_list) == 0:
+                    _type = TYPE_REMOTE_CHROME
+                else:
                     _type = max(type_list, key=type_list.count)
             else:
                 _type = data_json['type']