From f80df1ec10110a74e04da280c0ea99d355eca8e2 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Wed, 26 Sep 2018 10:24:42 -0300 Subject: [PATCH 1/4] Fix #2258 --- .../migrations/0009_auto_20180926_1015.py | 20 +++++++++++++++++++ sapl/compilacao/models.py | 2 +- sapl/static/styles/compilacao.scss | 3 ++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 sapl/compilacao/migrations/0009_auto_20180926_1015.py diff --git a/sapl/compilacao/migrations/0009_auto_20180926_1015.py b/sapl/compilacao/migrations/0009_auto_20180926_1015.py new file mode 100644 index 000000000..813358623 --- /dev/null +++ b/sapl/compilacao/migrations/0009_auto_20180926_1015.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2018-09-26 13:15 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('compilacao', '0008_auto_20180924_1724'), + ] + + operations = [ + migrations.AlterField( + model_name='tipodispositivo', + name='class_css', + field=models.CharField(blank=True, max_length=256, verbose_name='Classe CSS'), + ), + ] diff --git a/sapl/compilacao/models.py b/sapl/compilacao/models.py index d165976e6..efb834c51 100644 --- a/sapl/compilacao/models.py +++ b/sapl/compilacao/models.py @@ -602,7 +602,7 @@ class TipoDispositivo(BaseModel): max_length=50, unique=True, verbose_name=_('Nome')) class_css = models.CharField( blank=True, - max_length=20, + max_length=256, verbose_name=_('Classe CSS')) rotulo_prefixo_html = models.TextField( blank=True, diff --git a/sapl/static/styles/compilacao.scss b/sapl/static/styles/compilacao.scss index c2e7ed7ad..60500e24c 100644 --- a/sapl/static/styles/compilacao.scss +++ b/sapl/static/styles/compilacao.scss @@ -290,6 +290,7 @@ a:link:after, a:visited:after { margin-top: 0.6em; font-size: 1.15em; } + .page-break { page-break-before: always; } .bloco_alteracao { padding-left: 10%; @@ -303,9 +304,9 @@ a:link:after, a:visited:after { a, table, table td { color: #018 !important; } - } + .dn { /* Notas de Dispositivo*/ font-weight: normal; position: relative; From 4a241c2d4326877de7fc50ff051b51d6b09c3e29 Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Wed, 26 Sep 2018 13:59:52 -0300 Subject: [PATCH 2/4] =?UTF-8?q?ajusta=20comportamento=20na=20altera=C3=A7?= =?UTF-8?q?=C3=A3o=20de=20dispositivos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/compilacao/views.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sapl/compilacao/views.py b/sapl/compilacao/views.py index dc8dc42c8..82b5cbd10 100644 --- a/sapl/compilacao/views.py +++ b/sapl/compilacao/views.py @@ -2592,13 +2592,7 @@ class ActionsEditMixin(ActionDragAndMoveDispositivoAlteradoMixin, history = dispositivo_a_alterar.history() for d in history: - """FIXME: A comparação "<" deverá ser mudada para - "<=" caso seja necessário permitir duas alterações - com mesmo inicio_vigencia no mesmo dispositivo. Neste Caso, - a sequencia correta ficará a cargo dos reposicionamentos e - (a ser implementado) entre dispositivos de mesmo nível, - """ - if d.inicio_vigencia < bloco_alteracao.inicio_vigencia: + if d.inicio_vigencia <= bloco_alteracao.inicio_vigencia: dispositivo_a_alterar = d break From e566e3a09726690371d07f724a53b3d0d7053aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Sconetto?= Date: Wed, 26 Sep 2018 15:18:06 -0300 Subject: [PATCH 3/4] Add print exception on CSS (#2259) Fix #2254 --- sapl/static/styles/app.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sapl/static/styles/app.scss b/sapl/static/styles/app.scss index 046aa58e4..760830cbd 100644 --- a/sapl/static/styles/app.scss +++ b/sapl/static/styles/app.scss @@ -604,6 +604,12 @@ p { } } +@media print { + a[href]:after { + content: none !important; + } +} + /* Estilização da Listagem de Votos em sessões plenárias */ #styleparlamentar { From 1e79d8b1d1d61c959b4cc56cb13105ee9fefa4db Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 26 Sep 2018 16:58:41 -0300 Subject: [PATCH 4/4] Release: 3.1.121 --- docker-compose.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5c5dc08be..b559eff7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ sapldb: ports: - "5432:5432" sapl: - image: interlegis/sapl:3.1.120 + image: interlegis/sapl:3.1.121 restart: always environment: ADMIN_PASSWORD: interlegis diff --git a/setup.py b/setup.py index 3191572f2..e31740a2b 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ install_requires = [ ] setup( name='interlegis-sapl', - version='3.1.120', + version='3.1.121', packages=find_packages(), include_package_data=True, license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007',