From b8ca46fc2d78c5c50cc2166f6ee14807afc6c239 Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Fri, 13 Sep 2019 14:13:41 -0300 Subject: [PATCH] Fix migrations --- sapl/base/migrations/0039_auto_20190913_1228.py | 2 +- sapl/base/models.py | 1 - sapl/base/views.py | 2 +- sapl/protocoloadm/migrations/0024_merge_20190821_1418.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sapl/base/migrations/0039_auto_20190913_1228.py b/sapl/base/migrations/0039_auto_20190913_1228.py index 221e661d4..2a143c2b6 100644 --- a/sapl/base/migrations/0039_auto_20190913_1228.py +++ b/sapl/base/migrations/0039_auto_20190913_1228.py @@ -46,7 +46,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='autoruser', name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, unique=True, verbose_name='Usuário'), + field=models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='Usuário'), ), migrations.RunPython(migra_autores_usuarios), migrations.RemoveField( diff --git a/sapl/base/models.py b/sapl/base/models.py index d995c5529..119742430 100644 --- a/sapl/base/models.py +++ b/sapl/base/models.py @@ -256,7 +256,6 @@ class AutorUser(models.Model): get_settings_auth_user_model(), verbose_name=_('Usuário'), on_delete=models.PROTECT, - unique=True ) class Meta: diff --git a/sapl/base/views.py b/sapl/base/views.py index 546ce97ff..783864fe2 100644 --- a/sapl/base/views.py +++ b/sapl/base/views.py @@ -56,7 +56,7 @@ from sapl.parlamentares.models import (Parlamentar, Legislatura, Mandato, Filiac from sapl.protocoloadm.models import (Protocolo, TipoDocumentoAdministrativo, StatusTramitacaoAdministrativo, DocumentoAdministrativo, Anexado) -from sapl.sessao.models import (Bancada, PresencaOrdemDia, SessaoPlenaria, OrdemDia, +from sapl.sessao.models import (PresencaOrdemDia, SessaoPlenaria, OrdemDia, SessaoPlenariaPresenca, TipoSessaoPlenaria) from sapl.utils import (parlamentares_ativos, gerar_hash_arquivo, SEPARADOR_HASH_PROPOSICAO, show_results_filter_set, mail_service_configured, diff --git a/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py b/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py index 6bd5eea65..07543e7e9 100644 --- a/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py +++ b/sapl/protocoloadm/migrations/0024_merge_20190821_1418.py @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ ('protocoloadm', '0023_auto_20190711_1755'), - ('protocoloadm', '0023_merge_20190802_1112'), + ('protocoloadm', '0023_merge_20190802_1117'), ] operations = [