From 354c3c563bb3fbc820eb2cf2cb0233c395263c51 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Mon, 16 Sep 2019 11:04:32 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9perms=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E6=96=87=E4=BB=B6=E4=B9=8B=E9=97=B4=E7=9A=84=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=85=B3=E7=B3=BB=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0002_remove_remoteapp_system_user.py      |  2 +-
 .../migrations/0003_auto_20190916_1057.py     | 30 +++++++++++++++++++
 ... 0009_remoteapppermission_system_users.py} |  7 ++---
 3 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 apps/orgs/migrations/0003_auto_20190916_1057.py
 rename apps/perms/migrations/{0008_remoteapppermission_system_users.py => 0009_remoteapppermission_system_users.py} (83%)

diff --git a/apps/applications/migrations/0002_remove_remoteapp_system_user.py b/apps/applications/migrations/0002_remove_remoteapp_system_user.py
index 31d497f57..03b320752 100644
--- a/apps/applications/migrations/0002_remove_remoteapp_system_user.py
+++ b/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 = [
diff --git a/apps/orgs/migrations/0003_auto_20190916_1057.py b/apps/orgs/migrations/0003_auto_20190916_1057.py
new file mode 100644
index 000000000..d8be6dee5
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/apps/perms/migrations/0008_remoteapppermission_system_users.py b/apps/perms/migrations/0009_remoteapppermission_system_users.py
similarity index 83%
rename from apps/perms/migrations/0008_remoteapppermission_system_users.py
rename to apps/perms/migrations/0009_remoteapppermission_system_users.py
index 26246929b..625a4c4e7 100644
--- a/apps/perms/migrations/0008_remoteapppermission_system_users.py
+++ b/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'),
-        ('perms', '0007_remove_assetpermission_actions'),
+        ('assets', '0038_auto_20190911_1634'),
+        ('perms', '0008_auto_20190911_1907'),
     ]
 
     operations = [