diff --git a/sapl/base/migrations/0038_auto_20190604_1109.py b/sapl/base/migrations/0038_auto_20190604_1109.py deleted file mode 100644 index edc4703eb..000000000 --- a/sapl/base/migrations/0038_auto_20190604_1109.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-06-04 14:09 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('base', '0037_auto_20190527_0901'), - ] - - operations = [ - migrations.RemoveField( - model_name='appconfig', - name='cronometro_aparte', - ), - migrations.RemoveField( - model_name='appconfig', - name='cronometro_consideracoes', - ), - migrations.RemoveField( - model_name='appconfig', - name='cronometro_discurso', - ), - migrations.RemoveField( - model_name='appconfig', - name='cronometro_ordem', - ), - ] diff --git a/sapl/base/migrations/0041_auto_20191204_1130.py b/sapl/base/migrations/0039_auto_20191202_1114.py similarity index 85% rename from sapl/base/migrations/0041_auto_20191204_1130.py rename to sapl/base/migrations/0039_auto_20191202_1114.py index fa6cd6b98..351513b03 100644 --- a/sapl/base/migrations/0041_auto_20191204_1130.py +++ b/sapl/base/migrations/0039_auto_20191202_1114.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-12-04 14:30 +# Generated by Django 1.11.20 on 2019-12-02 14:14 from __future__ import unicode_literals from django.db import migrations, models @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('base', '0040_merge_20191030_1655'), + ('base', '0038_auditlog'), ] operations = [ diff --git a/sapl/base/migrations/0039_auto_20190913_1228.py b/sapl/base/migrations/0040_auto_20200513_1544.py similarity index 75% rename from sapl/base/migrations/0039_auto_20190913_1228.py rename to sapl/base/migrations/0040_auto_20200513_1544.py index 2a143c2b6..b4414e149 100644 --- a/sapl/base/migrations/0039_auto_20190913_1228.py +++ b/sapl/base/migrations/0040_auto_20200513_1544.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-09-13 15:28 +# Generated by Django 1.11.29 on 2020-05-13 18:44 from __future__ import unicode_literals from django.conf import settings from django.db import migrations, models import django.db.models.deletion + def migra_autores_usuarios(apps, schema_editor): Autor = apps.get_model('base', 'Autor') AutorUser = apps.get_model('base', 'AutorUser') @@ -18,7 +19,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('base', '0038_auto_20190604_1109'), + ('base', '0039_auto_20191202_1114'), ] operations = [ @@ -52,5 +53,21 @@ class Migration(migrations.Migration): migrations.RemoveField( model_name='autor', name='user', - ) + ), + migrations.RemoveField( + model_name='appconfig', + name='cronometro_aparte', + ), + migrations.RemoveField( + model_name='appconfig', + name='cronometro_consideracoes', + ), + migrations.RemoveField( + model_name='appconfig', + name='cronometro_discurso', + ), + migrations.RemoveField( + model_name='appconfig', + name='cronometro_ordem', + ), ] diff --git a/sapl/base/migrations/0040_merge_20191030_1655.py b/sapl/base/migrations/0040_merge_20191030_1655.py deleted file mode 100644 index a9f1d2e39..000000000 --- a/sapl/base/migrations/0040_merge_20191030_1655.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-10-30 19:55 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('base', '0038_auditlog'), - ('base', '0039_auto_20190913_1228'), - ] - - operations = [ - ]