Browse Source

fix #2293

pull/2295/head
Mariana Mendes 7 years ago
parent
commit
4992286d42
  1. 1
      sapl/materia/forms.py
  2. 2
      sapl/materia/views.py
  3. 7
      sapl/parlamentares/views.py

1
sapl/materia/forms.py

@ -1250,7 +1250,6 @@ class ProposicaoForm(forms.ModelForm):
widgets = { widgets = {
'descricao': widgets.Textarea(attrs={'rows': 4}), 'descricao': widgets.Textarea(attrs={'rows': 4}),
'observacao': widgets.Textarea(attrs={'rows': 4}),
'tipo': TipoProposicaoSelect(), 'tipo': TipoProposicaoSelect(),
'hash_code': forms.HiddenInput(), } 'hash_code': forms.HiddenInput(), }

2
sapl/materia/views.py

@ -663,7 +663,7 @@ class ProposicaoCrud(Crud):
class BaseMixin(Crud.BaseMixin): class BaseMixin(Crud.BaseMixin):
list_field_names = ['data_envio', 'data_recebimento', 'descricao', list_field_names = ['data_envio', 'data_recebimento', 'descricao',
'tipo', 'conteudo_gerado_related'] 'tipo', 'conteudo_gerado_related', 'cancelado', ]
class BaseLocalMixin: class BaseLocalMixin:
form_class = ProposicaoForm form_class = ProposicaoForm

7
sapl/parlamentares/views.py

@ -128,10 +128,15 @@ class ProposicaoParlamentarCrud(CrudBaseForListAndDetailExternalAppView):
def get_queryset(self): def get_queryset(self):
return super().get_queryset().filter( return super().get_queryset().filter(
data_envio__isnull=False, data_envio__isnull=False,
data_recebimento__isnull=False) data_recebimento__isnull=False,
cancelado=False)
class DetailView(CrudBaseForListAndDetailExternalAppView.DetailView): class DetailView(CrudBaseForListAndDetailExternalAppView.DetailView):
def get_queryset(self):
return super().get_queryset().filter(
cancelado=False)
@property @property
def extras_url(self): def extras_url(self):

Loading…
Cancel
Save