diff --git a/sapl/relatorios/views.py b/sapl/relatorios/views.py index a2c268d92..d6c12308f 100755 --- a/sapl/relatorios/views.py +++ b/sapl/relatorios/views.py @@ -556,28 +556,29 @@ def get_sessao_plenaria(sessao, casa): lst_expedientes = [] expedientes = ExpedienteSessao.objects.filter(sessao_plenaria=sessao).order_by('tipo__nome') for e in expedientes: - dic_expedientes = {"nom_expediente": e.tipo.nome} conteudo = e.conteudo + if conteudo: + # unescape HTML codes + # https://github.com/interlegis/sapl/issues/1046 + conteudo = re.sub('style=".*?"', '', conteudo) + conteudo = re.sub('class=".*?"', '', conteudo) + conteudo = re.sub('align=".*?"', '', conteudo) # OSTicket Ticket #796450 + conteudo = re.sub('
', '
', conteudo)
+ conteudo = re.sub('
', '
', conteudo) # OSTicket Ticket #796450
+ conteudo = html.unescape(conteudo)
+
+ # escape special character '&'
+ # https://github.com/interlegis/sapl/issues/1009
+ conteudo = conteudo.replace('&', '&')
+
+ # https://github.com/interlegis/sapl/issues/2386
+ conteudo = remove_html_comments(conteudo)
+
+ dic_expedientes = {
+ "nom_expediente": e.tipo.nome,
+ "txt_expediente": conteudo
+ }
- # unescape HTML codes
- # https://github.com/interlegis/sapl/issues/1046
- conteudo = re.sub('style=".*?"', '', conteudo)
- conteudo = re.sub('class=".*?"', '', conteudo)
- conteudo = re.sub('align=".*?"', '', conteudo) # OSTicket Ticket #796450
- conteudo = re.sub('
', '
', conteudo)
- conteudo = re.sub('
', '
', conteudo) # OSTicket Ticket #796450
- conteudo = html.unescape(conteudo)
-
- # escape special character '&'
- # https://github.com/interlegis/sapl/issues/1009
- conteudo = conteudo.replace('&', '&')
-
- # https://github.com/interlegis/sapl/issues/2386
- conteudo = remove_html_comments(conteudo)
-
- dic_expedientes["txt_expediente"] = conteudo
-
- if dic_expedientes:
lst_expedientes.append(dic_expedientes)
# Lista das matérias do Expediente, incluindo o resultado das votacoes