Skip to content
Snippets Groups Projects
Commit c3463e92 authored by Jean-Baptiste Pasquier's avatar Jean-Baptiste Pasquier
Browse files

Merge branch 'cleanup-migrations' into 'master'

minor: cleanup-migrations

See merge request startinblox/djangoldp-packages/djangoldp-circle!10
parents a74e63ca 470ca4c6
No related branches found
No related tags found
1 merge request!10minor: cleanup-migrations
Pipeline #1780 passed
# -*- coding: utf-8 -*- # -*- 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 __future__ import unicode_literals
from django.conf import settings from django.conf import settings
...@@ -13,7 +13,6 @@ class Migration(migrations.Migration): ...@@ -13,7 +13,6 @@ class Migration(migrations.Migration):
dependencies = [ dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL), migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('djangoldp_account', '0001_initial'),
] ]
operations = [ operations = [
...@@ -21,14 +20,12 @@ class Migration(migrations.Migration): ...@@ -21,14 +20,12 @@ class Migration(migrations.Migration):
name='Circle', name='Circle',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(default='', max_length=255)), ('name', models.CharField(max_length=255)),
('description', models.CharField(default='', max_length=255)), ('description', models.CharField(blank=True, max_length=255)),
('chatConfig', models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='circles', to='djangoldp_account.ChatConfig')), ('jabberID', models.CharField(blank=True, max_length=255, null=True)),
('owner', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='owned_chatrooms', to=settings.AUTH_USER_MODEL)), ('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)), ('team', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL)),
], ],
options={
'permissions': (('view_circle', 'Read'), ('control_circle', 'Control')),
},
), ),
] ]
# -*- 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),
),
]
# -*- 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),
]
# -*- 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',
),
]
# -*- 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={},
),
]
# -*- 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),
),
]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment