Merge tag '3.1.156' into migracao

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:

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.")

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');
+        """)
+    ]

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'

sapl/templates/base.html

@@ -179,7 +179,7 @@
                 <small>
                   Desenvolvido pelo <a href="http://www.interlegis.leg.br/">Interlegis</a> em software livre e aberto.
                 </small>
-		<span>Release: 3.1.155</span>
+		<span>Release: 3.1.156</span>
               </p>
             </div>
             <div class="col-md-4">

sapl/templates/sessao/subnav.yaml

@@ -51,4 +51,5 @@
     - title: {% trans 'Resumo' %}
       url: resumo
     - title: {% trans 'Extrato' %}
-      url: resumo_ata     
+      url: resumo_ata
+      check_permission: sessao.add_sessaoplenaria

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',