Browse Source

CORRIGIDO ETIQUETA ADMINISTRATIVA E REQUIREMENTS PIP DO PROJETO

pull/3858/head
Leo Alves 7 months ago
parent
commit
e2c14115da
  1. 0
      --capture-output
  2. 6
      requirements/requirements.txt
  3. 0
      sapl.wsgi:application
  4. 7
      sapl/base/templatetags/menus.py
  5. 13
      sapl/relatorios/views.py

0
--capture-output

6
requirements/requirements.txt

@ -1,5 +1,6 @@
#REQUIREMENTS ORIGINAL DO PROJETO SAPL #REQUIREMENTS ORIGINAL DO PROJETO SAPL
django==2.2.28 django==2.2.28
django-debug-toolbar==2.2.1
django-haystack==3.1.1 django-haystack==3.1.1
django-filter==2.4.0 django-filter==2.4.0
djangorestframework==3.12.4 djangorestframework==3.12.4
@ -52,3 +53,8 @@ cryptography>=41.0.0
git+https://github.com/interlegis/django-admin-bootstrapped 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

0
sapl.wsgi:application

7
sapl/base/templatetags/menus.py

@ -184,8 +184,11 @@ def resolve_urls_inplace(menu, pk, rm, context):
logger.error(log) logger.error(log)
raise Exception(log) raise Exception(log)
menu['active'] = 'active'\ #menu['active'] = 'active'\
if context['request'].path == menu['url'] else '' #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']: if not menu['active']:
""" """
Se não encontrada diretamente, Se não encontrada diretamente,

13
sapl/relatorios/views.py

@ -1,6 +1,8 @@
import collections import collections
import html import html
import logging import logging
logger = logging.getLogger(__name__)
import re import re
from datetime import datetime as dt, datetime 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): def etiqueta_materia_legislativa(request, pk):
try:
base_url = request.build_absolute_uri() base_url = request.build_absolute_uri()
materia_legislativa = MateriaLegislativa.objects.get(pk=pk) materia_legislativa = MateriaLegislativa.objects.get(pk=pk)
pdf_file = gera_etiqueta_ml(materia_legislativa, base_url) pdf_file = gera_etiqueta_ml(materia_legislativa, base_url)
response = HttpResponse(content_type='application/pdf;') response = HttpResponse(content_type="application/pdf;")
response['Content-Disposition'] = 'inline; filename=etiqueta.pdf' response["Content-Disposition"] = "inline; filename=etiqueta.pdf"
response['Content-Transfer-Encoding'] = 'binary' response["Content-Transfer-Encoding"] = "binary"
response.write(pdf_file) response.write(pdf_file)
return response return response
except Exception:
logger.exception("ERRO etiqueta_materia_legislativa pk=%s", pk)
raise
def relatorio_materia_tramitacao(request, pk): def relatorio_materia_tramitacao(request, pk):

Loading…
Cancel
Save