From 2a3107ea3c621d66443e40ccb3e1b51727f66ea8 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 25 Nov 2018 12:31:11 +0100 Subject: [PATCH] Rebuild migrations again --- passbook/audit/migrations/0001_initial.py | 2 +- passbook/core/migrations/0001_initial.py | 5 +++-- .../0002_application_skip_authorization.py | 18 ------------------ .../core/migrations/0003_auto_20181124_1031.py | 18 ------------------ passbook/ldap/migrations/__init__.py | 0 .../oauth_client/migrations/0001_initial.py | 2 +- .../oauth_provider/migrations/0001_initial.py | 8 ++++++-- passbook/saml_idp/migrations/0001_initial.py | 4 ++-- 8 files changed, 13 insertions(+), 44 deletions(-) delete mode 100644 passbook/core/migrations/0002_application_skip_authorization.py delete mode 100644 passbook/core/migrations/0003_auto_20181124_1031.py delete mode 100644 passbook/ldap/migrations/__init__.py diff --git a/passbook/audit/migrations/0001_initial.py b/passbook/audit/migrations/0001_initial.py index 8cc08d842..d6b25b693 100644 --- a/passbook/audit/migrations/0001_initial.py +++ b/passbook/audit/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.3 on 2018-11-22 10:03 +# Generated by Django 2.1.3 on 2018-11-25 10:39 import uuid diff --git a/passbook/core/migrations/0001_initial.py b/passbook/core/migrations/0001_initial.py index a68ba7f9b..cd29052c0 100644 --- a/passbook/core/migrations/0001_initial.py +++ b/passbook/core/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.3 on 2018-11-22 10:03 +# Generated by Django 2.1.3 on 2018-11-25 10:39 import uuid @@ -92,6 +92,7 @@ class Migration(migrations.Migration): ('name', models.TextField()), ('launch_url', models.URLField(blank=True, null=True)), ('icon_url', models.TextField(blank=True, null=True)), + ('skip_authorization', models.BooleanField(default=False)), ('provider', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='passbook_core.Provider')), ], options={ @@ -128,7 +129,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='rulemodel', name='rules', - field=models.ManyToManyField(to='passbook_core.Rule'), + field=models.ManyToManyField(blank=True, to='passbook_core.Rule'), ), migrations.AddField( model_name='usersourceconnection', diff --git a/passbook/core/migrations/0002_application_skip_authorization.py b/passbook/core/migrations/0002_application_skip_authorization.py deleted file mode 100644 index d8b333a93..000000000 --- a/passbook/core/migrations/0002_application_skip_authorization.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.3 on 2018-11-24 09:36 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('passbook_core', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='application', - name='skip_authorization', - field=models.BooleanField(default=False), - ), - ] diff --git a/passbook/core/migrations/0003_auto_20181124_1031.py b/passbook/core/migrations/0003_auto_20181124_1031.py deleted file mode 100644 index e88c740af..000000000 --- a/passbook/core/migrations/0003_auto_20181124_1031.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.3 on 2018-11-24 10:31 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('passbook_core', '0002_application_skip_authorization'), - ] - - operations = [ - migrations.AlterField( - model_name='rulemodel', - name='rules', - field=models.ManyToManyField(blank=True, to='passbook_core.Rule'), - ), - ] diff --git a/passbook/ldap/migrations/__init__.py b/passbook/ldap/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/passbook/oauth_client/migrations/0001_initial.py b/passbook/oauth_client/migrations/0001_initial.py index 5e307a4c2..90b2029f8 100644 --- a/passbook/oauth_client/migrations/0001_initial.py +++ b/passbook/oauth_client/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.3 on 2018-11-22 10:03 +# Generated by Django 2.1.3 on 2018-11-25 10:39 import django.db.models.deletion from django.db import migrations, models diff --git a/passbook/oauth_provider/migrations/0001_initial.py b/passbook/oauth_provider/migrations/0001_initial.py index 483ca9af7..783c536a3 100644 --- a/passbook/oauth_provider/migrations/0001_initial.py +++ b/passbook/oauth_provider/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.3 on 2018-11-24 10:27 +# Generated by Django 2.1.3 on 2018-11-25 10:39 import django.db.models.deletion import oauth2_provider.generators @@ -10,9 +10,13 @@ class Migration(migrations.Migration): initial = True + run_before = [ + ('oauth2_provider', '0001_initial'), + ] + dependencies = [ + ('passbook_core', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('passbook_core', '0002_application_skip_authorization'), ] operations = [ diff --git a/passbook/saml_idp/migrations/0001_initial.py b/passbook/saml_idp/migrations/0001_initial.py index a200e7593..933a80d7a 100644 --- a/passbook/saml_idp/migrations/0001_initial.py +++ b/passbook/saml_idp/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.3 on 2018-11-24 09:48 +# Generated by Django 2.1.3 on 2018-11-25 10:39 import django.db.models.deletion from django.db import migrations, models @@ -9,7 +9,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('passbook_core', '0002_application_skip_authorization'), + ('passbook_core', '0001_initial'), ] operations = [