From 4a0da7cf356ac548c6ac06265780d70c2a4604f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Cantu=C3=A1ria?= <cantuariavc@gmail.com>
Date: Tue, 12 May 2020 19:08:39 -0300
Subject: [PATCH] =?UTF-8?q?Remove=20expedientes=20sem=20conte=C3=BAdos=20d?=
 =?UTF-8?q?o=20relat=C3=B3rio=20sessao=20pdf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sapl/relatorios/views.py | 41 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

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('<p\s+>', '<p>', conteudo)
+            conteudo = re.sub('<br\s+/>', '<br/>', conteudo)  # OSTicket Ticket #796450
+            conteudo = html.unescape(conteudo)
+
+            # escape special character '&'
+            #   https://github.com/interlegis/sapl/issues/1009
+            conteudo = conteudo.replace('&', '&amp;')
+
+            # 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('<p\s+>', '<p>', conteudo)
-        conteudo = re.sub('<br\s+/>', '<br/>', conteudo)  # OSTicket Ticket #796450
-        conteudo = html.unescape(conteudo)
-
-        # escape special character '&'
-        #   https://github.com/interlegis/sapl/issues/1009
-        conteudo = conteudo.replace('&', '&amp;')
-
-        # 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