From a652978efad82289aab16371ce223af7fdf8e748 Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Mon, 12 Mar 2018 15:27:55 -0300 Subject: [PATCH] Fix #1566 --- sapl/comissoes/forms.py | 3 -- sapl/comissoes/models.py | 2 +- sapl/templates/comissoes/layouts.yaml | 18 ++++++++- sapl/templates/comissoes/reuniao_list.html | 43 ---------------------- 4 files changed, 18 insertions(+), 48 deletions(-) delete mode 100644 sapl/templates/comissoes/reuniao_list.html diff --git a/sapl/comissoes/forms.py b/sapl/comissoes/forms.py index 3ddd2cf05..e3d9845c3 100644 --- a/sapl/comissoes/forms.py +++ b/sapl/comissoes/forms.py @@ -12,9 +12,6 @@ from sapl.comissoes.models import (Comissao, Composicao, DocumentoAcessorio, from sapl.parlamentares.models import Legislatura, Mandato, Parlamentar - - - class ParticipacaoCreateForm(forms.ModelForm): parent_pk = forms.CharField(required=False) # widget=forms.HiddenInput()) diff --git a/sapl/comissoes/models.py b/sapl/comissoes/models.py index 286e6f639..0675f0a8a 100644 --- a/sapl/comissoes/models.py +++ b/sapl/comissoes/models.py @@ -292,7 +292,7 @@ class DocumentoAcessorio(models.Model): data = models.DateField(blank=True, null=True, default=None, verbose_name=_('Data')) autor = models.CharField( - max_length=50, blank=True, verbose_name=_('Autor')) + max_length=100, verbose_name=_('Autor')) ementa = models.TextField(blank=True, verbose_name=_('Ementa')) indexacao = models.TextField(blank=True) arquivo = models.FileField( diff --git a/sapl/templates/comissoes/layouts.yaml b/sapl/templates/comissoes/layouts.yaml index 5d0026ba2..f0a21799c 100644 --- a/sapl/templates/comissoes/layouts.yaml +++ b/sapl/templates/comissoes/layouts.yaml @@ -52,4 +52,20 @@ Reuniao: - url_video url_audio - observacao - upload_pauta upload_ata upload_anexo - - comissao \ No newline at end of file + - comissao + +DocumentoAcessorio: + {% trans 'Documento Acessório' %}: + - nome data + - autor arquivo + - indexacao + - ementa + +DocumentoAcessorioEdit: + {% trans 'Documento Acessório' %}: + - nome data + - autor arquivo + - indexacao + - ementa + + diff --git a/sapl/templates/comissoes/reuniao_list.html b/sapl/templates/comissoes/reuniao_list.html deleted file mode 100644 index 8e5c926db..000000000 --- a/sapl/templates/comissoes/reuniao_list.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "crud/list.html" %} -{% load i18n common_tags crispy_forms_tags%} - -{% block base_content %} - {% if user.is_authenticated and perms.comissoes.add_reuniao %} -
- {% block actions %} -
- {% if view.create_url %} - - {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %} - - {% endif %} - {% block more_buttons %}{% endblock more_buttons %} -
- {% endblock actions %} -
- {% endif %} - -
- Selecione a Reunião -
- -
-
-
- {% if user.is_authenticated and perms.comissoes.add_documentoacessorio %} -
- - Adicionar Documento Acessório em Reunião - -
- {% endif %} -
- - -{% endblock base_content %}