From 71fa96e14c7d01c31588e9a361abb958e58432e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rog=C3=A9rio=20Fr=C3=A1?=
Date: Wed, 15 May 2019 09:12:58 -0300
Subject: [PATCH 1/4] Fix #2768 (#2779)
---
sapl/templates/sessao/subnav.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sapl/templates/sessao/subnav.yaml b/sapl/templates/sessao/subnav.yaml
index 28717e4ab..59a127ad3 100644
--- a/sapl/templates/sessao/subnav.yaml
+++ b/sapl/templates/sessao/subnav.yaml
@@ -51,4 +51,5 @@
- title: {% trans 'Resumo' %}
url: resumo
- title: {% trans 'Extrato' %}
- url: resumo_ata
\ No newline at end of file
+ url: resumo_ata
+ check_permission: sessao.add_sessaoplenaria
From f567bba2b7aef2ba1aed906684b10cad2bdba1de Mon Sep 17 00:00:00 2001
From: Cesar Carvalho
Date: Wed, 15 May 2019 15:51:01 -0300
Subject: [PATCH 2/4] =?UTF-8?q?HOT-FIX:=20Corrige=20recupera=C3=A7=C3=A3o?=
=?UTF-8?q?=20de=20mat=C3=A9ria?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sapl/materia/views.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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.")
From b8d32b0b94a666d31ed202da40b067367ffe3993 Mon Sep 17 00:00:00 2001
From: Edward Ribeiro
Date: Wed, 15 May 2019 17:49:53 -0300
Subject: [PATCH 3/4] =?UTF-8?q?HOT-FIX:=20mini-migra=C3=A7=C3=A3o=20para?=
=?UTF-8?q?=20commit=2054c6b38?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../migrations/0028_auto_20190515_1744.py | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 sapl/parlamentares/migrations/0028_auto_20190515_1744.py
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');
+ """)
+ ]
From e638f5b47095e5e8d81e009e507ca02bb3dbdc48 Mon Sep 17 00:00:00 2001
From: Edward Ribeiro
Date: Wed, 15 May 2019 17:50:50 -0300
Subject: [PATCH 4/4] Release: 3.1.156
---
docker-compose.yml | 2 +-
sapl/settings.py | 2 +-
sapl/templates/base.html | 2 +-
setup.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
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/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
diff --git a/setup.py b/setup.py
index 662d4fec7..29b23dd01 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ install_requires = [
]
setup(
name='interlegis-sapl',
- version='3.1.155',
+ version='3.1.156',
packages=find_packages(),
include_package_data=True,
license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007',