From e2c14115daaedd28403600a129d53e6029ccfb7f Mon Sep 17 00:00:00 2001 From: Leo Alves Date: Wed, 11 Feb 2026 11:22:59 -0300 Subject: [PATCH] CORRIGIDO ETIQUETA ADMINISTRATIVA E REQUIREMENTS PIP DO PROJETO --- --capture-output | 0 requirements/requirements.txt | 6 ++++++ sapl.wsgi:application | 0 sapl/base/templatetags/menus.py | 7 +++++-- sapl/relatorios/views.py | 27 ++++++++++++++++----------- 5 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 --capture-output create mode 100644 sapl.wsgi:application diff --git a/--capture-output b/--capture-output new file mode 100644 index 000000000..e69de29bb diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 371027d5d..22814a32d 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,6 @@ #REQUIREMENTS ORIGINAL DO PROJETO SAPL django==2.2.28 +django-debug-toolbar==2.2.1 django-haystack==3.1.1 django-filter==2.4.0 djangorestframework==3.12.4 @@ -52,3 +53,8 @@ cryptography>=41.0.0 git+https://github.com/interlegis/django-admin-bootstrapped + +setuptools==80.10.2 +pycairo=1.29.0 +freetype-py==2.5.1 +rlPyCairo==0.4.0 diff --git a/sapl.wsgi:application b/sapl.wsgi:application new file mode 100644 index 000000000..e69de29bb diff --git a/sapl/base/templatetags/menus.py b/sapl/base/templatetags/menus.py index 93a2f6c28..b4aa7743d 100644 --- a/sapl/base/templatetags/menus.py +++ b/sapl/base/templatetags/menus.py @@ -184,8 +184,11 @@ def resolve_urls_inplace(menu, pk, rm, context): logger.error(log) raise Exception(log) - menu['active'] = 'active'\ - if context['request'].path == menu['url'] else '' + #menu['active'] = 'active'\ + #if context['request'].path == menu['url'] else '' + req = context.get('request') + menu['active'] = 'active' if req and req.path == menu['url'] else '' + if not menu['active']: """ Se não encontrada diretamente, diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py index bc28b3ffc..1728dbf49 100755 --- a/sapl/relatorios/views.py +++ b/sapl/relatorios/views.py @@ -1,6 +1,8 @@ import collections import html import logging +logger = logging.getLogger(__name__) + import re from datetime import datetime as dt, datetime @@ -1764,17 +1766,20 @@ def gera_etiqueta_ml(materia_legislativa, base_url): def etiqueta_materia_legislativa(request, pk): - base_url = request.build_absolute_uri() - materia_legislativa = MateriaLegislativa.objects.get(pk=pk) - - pdf_file = gera_etiqueta_ml(materia_legislativa, base_url) - - response = HttpResponse(content_type='application/pdf;') - response['Content-Disposition'] = 'inline; filename=etiqueta.pdf' - response['Content-Transfer-Encoding'] = 'binary' - response.write(pdf_file) - - return response + try: + base_url = request.build_absolute_uri() + materia_legislativa = MateriaLegislativa.objects.get(pk=pk) + + pdf_file = gera_etiqueta_ml(materia_legislativa, base_url) + + response = HttpResponse(content_type="application/pdf;") + response["Content-Disposition"] = "inline; filename=etiqueta.pdf" + response["Content-Transfer-Encoding"] = "binary" + response.write(pdf_file) + return response + except Exception: + logger.exception("ERRO etiqueta_materia_legislativa pk=%s", pk) + raise def relatorio_materia_tramitacao(request, pk):