From 069684fa22e136fa551c6cb2310572463e718385 Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Fri, 9 Mar 2018 12:22:22 -0300 Subject: [PATCH] Corrige alguns erros e adiciona mais detalhes no template --- sapl/comissoes/forms.py | 2 +- sapl/comissoes/models.py | 4 ---- sapl/templates/comissoes/reuniao_list.html | 16 ++++++++++++++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/sapl/comissoes/forms.py b/sapl/comissoes/forms.py index 5e903caa9..e2c54ef3f 100644 --- a/sapl/comissoes/forms.py +++ b/sapl/comissoes/forms.py @@ -186,7 +186,7 @@ class DocumentoAcessorioCreateForm(forms.ModelForm): comissao_pk = int(comissao['parent_pk']) reuniao = Reuniao.objects.get(id=reuniao_pk) documentos = reuniao.documentoacessorio_set.all() - return self.create_documentoacessorio() + return self.create_documentoacessorio() def create_documentoacessorio(self): diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py index d4b6e5345..286e6f639 100644 --- a/sapl/comissoes/models.py +++ b/sapl/comissoes/models.py @@ -321,10 +321,6 @@ class DocumentoAcessorio(models.Model): if self.arquivo: self.arquivo.delete() - for p in self.proposicao.all(): - p.conteudo_gerado_related = None - p.save() - return models.Model.delete( self, using=using, keep_parents=keep_parents) diff --git a/sapl/templates/comissoes/reuniao_list.html b/sapl/templates/comissoes/reuniao_list.html index d9739ab9e..8e5c926db 100644 --- a/sapl/templates/comissoes/reuniao_list.html +++ b/sapl/templates/comissoes/reuniao_list.html @@ -17,15 +17,27 @@ {% endif %} +
+ Selecione a Reunião +
+ +

{% if user.is_authenticated and perms.comissoes.add_documentoacessorio %}
- - Adicionar Participação em Comissão + + Adicionar Documento Acessório em Reunião
{% endif %}
+ {% endblock base_content %}