diff --git a/docker-compose.yml b/docker-compose.yml index ca1e573fa..81517402d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ sapldb: ports: - "5432:5432" sapl: - image: interlegis/sapl:3.1.155 + image: interlegis/sapl:3.1.156 # build: . restart: always environment: diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 059ec38b2..afde0ef64 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -333,7 +333,7 @@ def recuperar_materia(request): logger.debug("user=" + username + ". Tentando obter numeração da matéria.") numeracao = sapl.base.models.AppConfig.objects.last( - ).sequencia_numeracao_proposicao + ).sequencia_numeracao_protocolo except AttributeError as e: logger.error("user=" + username + ". " + str(e) + " Numeracao da matéria definida como None.") diff --git a/sapl/parlamentares/migrations/0028_auto_20190515_1744.py b/sapl/parlamentares/migrations/0028_auto_20190515_1744.py new file mode 100644 index 000000000..2c230d88c --- /dev/null +++ b/sapl/parlamentares/migrations/0028_auto_20190515_1744.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-05-15 20:44 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('parlamentares', '0027_auto_20190430_0839'), + ] + + operations = [ + migrations.RunSQL(""" + UPDATE base_autor SET content_type_id = (SELECT id FROM django_content_type WHERE app_label = 'parlamentares' AND model = 'bloco') + WHERE content_type_id = (SELECT id FROM django_content_type WHERE app_label = 'sessao' AND model = 'bloco'); + """) + ] diff --git a/sapl/settings.py b/sapl/settings.py index ae900faf7..959acc40d 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -41,7 +41,7 @@ ALLOWED_HOSTS = ['*'] LOGIN_REDIRECT_URL = '/' LOGIN_URL = '/login/?next=' -SAPL_VERSION = '3.1.155' +SAPL_VERSION = '3.1.156' if DEBUG: EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' diff --git a/sapl/templates/base.html b/sapl/templates/base.html index a2b37cd02..c816d09f6 100644 --- a/sapl/templates/base.html +++ b/sapl/templates/base.html @@ -179,7 +179,7 @@ Desenvolvido pelo Interlegis em software livre e aberto. - Release: 3.1.155 + Release: 3.1.156