diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index bb91e7dc7..8fb26d084 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -1250,7 +1250,6 @@ class ProposicaoForm(forms.ModelForm): widgets = { 'descricao': widgets.Textarea(attrs={'rows': 4}), - 'observacao': widgets.Textarea(attrs={'rows': 4}), 'tipo': TipoProposicaoSelect(), 'hash_code': forms.HiddenInput(), } diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 767726a97..9b10606a1 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -663,7 +663,7 @@ class ProposicaoCrud(Crud): class BaseMixin(Crud.BaseMixin): list_field_names = ['data_envio', 'data_recebimento', 'descricao', - 'tipo', 'conteudo_gerado_related'] + 'tipo', 'conteudo_gerado_related', 'cancelado', ] class BaseLocalMixin: form_class = ProposicaoForm diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py index ad4a8f5e5..f3fb81de5 100644 --- a/sapl/parlamentares/views.py +++ b/sapl/parlamentares/views.py @@ -128,10 +128,15 @@ class ProposicaoParlamentarCrud(CrudBaseForListAndDetailExternalAppView): def get_queryset(self): return super().get_queryset().filter( data_envio__isnull=False, - data_recebimento__isnull=False) + data_recebimento__isnull=False, + cancelado=False) class DetailView(CrudBaseForListAndDetailExternalAppView.DetailView): + def get_queryset(self): + return super().get_queryset().filter( + cancelado=False) + @property def extras_url(self):