Merge pull request #3225 from jumpserver/dev_migrations

[Update] 修改perms迁移文件之间的依赖关系，添加迁移文件

apps/applications/migrations/0002_remove_remoteapp_system_user.py

@@ -7,7 +7,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('applications', '0001_initial'),
-        ('perms', '0008_remoteapppermission_system_users'),
+        ('perms', '0009_remoteapppermission_system_users'),
     ]
 
     operations = [

apps/orgs/migrations/0003_auto_20190916_1057.py

@@ -0,0 +1,30 @@
+# Generated by Django 2.1.7 on 2019-09-16 02:57
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('orgs', '0002_auto_20180903_1132'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organization',
+            name='auditors',
+            field=models.ManyToManyField(blank=True, related_name='related_audit_orgs', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='organization',
+            name='admins',
+            field=models.ManyToManyField(blank=True, related_name='related_admin_orgs', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='organization',
+            name='users',
+            field=models.ManyToManyField(blank=True, related_name='related_user_orgs', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

apps/perms/migrations/0009_remoteapppermission_system_users.py

@@ -1,7 +1,6 @@
-# Generated by Django 2.1.7 on 2019-09-09 09:09
+# Generated by Django 2.1.7 on 2019-09-16 02:57
 
 from django.db import migrations, models
-from assets.models import SystemUser
 
 
 def migrate_system_user_from_remote_app_to_remote_app_perms(apps, schema_editor):
@@ -16,8 +15,8 @@ def migrate_system_user_from_remote_app_to_remote_app_perms(apps, schema_editor)
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('assets', '0037_auto_20190724_2002'),
+        ('assets', '0038_auto_20190911_1634'),
-        ('perms', '0007_remove_assetpermission_actions'),
+        ('perms', '0008_auto_20190911_1907'),
     ]
 
     operations = [