Browse Source

Corrige bug na apresentação de link sigad

dependabot/pip/requirements/requests-2.33.0 4.0.15
Sesóstris Vieira 3 weeks ago
parent
commit
7e7cf80bfd
  1. 3
      sigi/apps/convenios/models.py
  2. 2
      sigi/apps/espacos/models.py
  3. 4
      sigi/apps/eventos/models.py
  4. 3
      sigi/apps/utils/__init__.py

3
sigi/apps/convenios/models.py

@ -13,6 +13,7 @@ from django.template.exceptions import TemplateSyntaxError
from django.urls import reverse
from django.utils import timezone
from django.utils.formats import date_format
from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _
from django_weasyprint.utils import django_url_fetcher
from docx import Document
@ -376,7 +377,7 @@ class Convenio(models.Model):
return obj.get_sigad_url()
def get_sigad_url(self, display_type="numero"):
return get_sigad_url(self.num_processo_sf, display_type)
return mark_safe(get_sigad_url(self.num_processo_sf, display_type))
def get_url_gescon(self):
if not self.id_contrato_gescon:

2
sigi/apps/espacos/models.py

@ -218,7 +218,7 @@ class Reserva(models.Model):
)
def get_sigad_url(self):
return get_sigad_url(self.num_processo)
return mark_safe(get_sigad_url(self.num_processo))
class RecursoSolicitado(models.Model):

4
sigi/apps/eventos/models.py

@ -177,7 +177,7 @@ class Solicitacao(models.Model):
@admin.display(description=_("SIGAD"), ordering="num_processo")
def get_sigad_url(self):
return get_sigad_url(self.num_processo)
return mark_safe(get_sigad_url(self.num_processo))
class ItemSolicitado(models.Model):
@ -498,7 +498,7 @@ class Evento(models.Model):
return reverse("admin:eventos_evento_change", args=[self.id])
def get_sigad_url(self):
return get_sigad_url(self.num_processo)
return mark_safe(get_sigad_url(self.num_processo))
@property
def link_inscricao(self):

3
sigi/apps/utils/__init__.py

@ -5,6 +5,7 @@ from django.core.exceptions import FieldDoesNotExist
from django.db import models
from django.template.loader import render_to_string
from django.utils.encoding import force_str
from django.utils.safestring import mark_safe
class SearchField(models.TextField):
@ -121,7 +122,7 @@ def get_sigad_url(num_sigad, display_type="numero"):
display = f'<i class="bi bi-eye"></i> {num_sigad}'
else:
display = num_sigad
return (
return mark_safe(
f'<a href="https://intra.senado.leg.br/sigad/novo/protocolo/'
f"impressao.asp?area=processo&txt_numero_orgao={orgao}"
f'&txt_numero_sequencial={sequencial}&txt_numero_ano={ano}" '

Loading…
Cancel
Save