diff --git a/djangoldp_circle/migrations/0001_initial.py b/djangoldp_circle/migrations/0001_initial.py index 89d2d43a4457cb0576a6272b3dd1934563eaf454..5aa4f6dac1fb03a3dc770ecb5c50a2027a73d7fa 100644 --- a/djangoldp_circle/migrations/0001_initial.py +++ b/djangoldp_circle/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2019-01-10 06:50 +# Generated by Django 1.11.20 on 2019-08-28 12:01 from __future__ import unicode_literals from django.conf import settings @@ -13,7 +13,6 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('djangoldp_account', '0001_initial'), ] operations = [ @@ -21,14 +20,12 @@ class Migration(migrations.Migration): name='Circle', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(default='', max_length=255)), - ('description', models.CharField(default='', max_length=255)), - ('chatConfig', models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='circles', to='djangoldp_account.ChatConfig')), - ('owner', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='owned_chatrooms', to=settings.AUTH_USER_MODEL)), + ('name', models.CharField(max_length=255)), + ('description', models.CharField(blank=True, max_length=255)), + ('jabberID', models.CharField(blank=True, max_length=255, null=True)), + ('jabberRoom', models.BooleanField(default=True)), + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='owned_circles', to=settings.AUTH_USER_MODEL)), ('team', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL)), ], - options={ - 'permissions': (('view_circle', 'Read'), ('control_circle', 'Control')), - }, ), ] diff --git a/djangoldp_circle/migrations/0002_auto_20190110_0719.py b/djangoldp_circle/migrations/0002_auto_20190110_0719.py deleted file mode 100644 index b00775d3c7f287268df12a957dd64812226ea67e..0000000000000000000000000000000000000000 --- a/djangoldp_circle/migrations/0002_auto_20190110_0719.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2019-01-10 07:19 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('djangoldp_circle', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='circle', - name='owner', - field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='owned_circles', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/djangoldp_circle/migrations/0003_auto_20190121_1659.py b/djangoldp_circle/migrations/0003_auto_20190121_1659.py deleted file mode 100644 index bed6cbd2c1da4c2d65008cf350ec0fdc85e188b0..0000000000000000000000000000000000000000 --- a/djangoldp_circle/migrations/0003_auto_20190121_1659.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2019-01-21 16:59 -from __future__ import unicode_literals - -from django.db import migrations, models - -def migrate_data(apps, schema_editor): - Circle = apps.get_model('djangoldp_circle', 'Circle') - for circle in Circle.objects.all(): - circle.jabberID = circle.chatConfig.jabberID - circle.jabberRoom = circle.chatConfig.jabberRoom - circle.save() - -class Migration(migrations.Migration): - - dependencies = [ - ('djangoldp_circle', '0002_auto_20190110_0719'), - ] - - operations = [ - migrations.AddField( - model_name='circle', - name='jabberID', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='circle', - name='jabberRoom', - field=models.BooleanField(default=True), - ), - migrations.RunPython(migrate_data), - ] diff --git a/djangoldp_circle/migrations/0004_remove_circle_chatconfig.py b/djangoldp_circle/migrations/0004_remove_circle_chatconfig.py deleted file mode 100644 index bd858b3083364884c5cb3676f29e274e557e40b3..0000000000000000000000000000000000000000 --- a/djangoldp_circle/migrations/0004_remove_circle_chatconfig.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2019-01-21 17:06 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('djangoldp_circle', '0003_auto_20190121_1659'), - ] - - operations = [ - migrations.RemoveField( - model_name='circle', - name='chatConfig', - ), - ] diff --git a/djangoldp_circle/migrations/0005_auto_20190404_1451.py b/djangoldp_circle/migrations/0005_auto_20190404_1451.py deleted file mode 100644 index a4b7e69e27786015f5070bc3af204493371ba332..0000000000000000000000000000000000000000 --- a/djangoldp_circle/migrations/0005_auto_20190404_1451.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2019-04-04 14:51 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('djangoldp_circle', '0004_remove_circle_chatconfig'), - ] - - operations = [ - migrations.AlterModelOptions( - name='circle', - options={}, - ), - ] diff --git a/djangoldp_circle/migrations/0006_auto_20190524_1349.py b/djangoldp_circle/migrations/0006_auto_20190524_1349.py deleted file mode 100644 index a2bad22290677012098c4d54ff2a1defb6306e12..0000000000000000000000000000000000000000 --- a/djangoldp_circle/migrations/0006_auto_20190524_1349.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-05-24 13:49 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('djangoldp_circle', '0005_auto_20190404_1451'), - ] - - operations = [ - migrations.AlterField( - model_name='circle', - name='description', - field=models.CharField(blank=True, max_length=255), - ), - migrations.AlterField( - model_name='circle', - name='name', - field=models.CharField(max_length=255), - ), - ]