diff --git a/sapl/comissoes/forms.py b/sapl/comissoes/forms.py index dfc2f1221..7cf35bb3c 100644 --- a/sapl/comissoes/forms.py +++ b/sapl/comissoes/forms.py @@ -148,13 +148,15 @@ class ComissaoForm(forms.ModelForm): class ReuniaoForm(ModelForm): + comissao = forms.ModelChoiceField(queryset=Comissao.objects.all(), + widget=forms.HiddenInput()) + class Meta: model = Reuniao exclude = ['cod_andamento_reuniao'] def clean(self): super(ReuniaoForm, self).clean() - import ipdb; ipdb.set_trace() if not self.is_valid(): return self.cleaned_data diff --git a/sapl/comissoes/views.py b/sapl/comissoes/views.py index 1f7b529c0..d27cb51e4 100644 --- a/sapl/comissoes/views.py +++ b/sapl/comissoes/views.py @@ -161,17 +161,8 @@ class ReuniaoCrud(MasterDetailCrud): class ListView(MasterDetailCrud.ListView): - template_name = "comissoes/reuniao_list.html" paginate_by = None - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - self.reuniao_pk = context['root_pk'] - - return context - - def get_rows(self, object_list): - for obj in object_list: class UpdateView(MasterDetailCrud.UpdateView): form_class = ReuniaoForm @@ -184,16 +175,10 @@ class ReuniaoCrud(MasterDetailCrud): form_class = ReuniaoForm def get_initial(self): - comissao = Comissao.objects.order_by('data_criacao').first() - if comissao: - return { - 'comissao': comissao - } - else: - msg = _('Cadastre alguma comissão antes de adicionar ' - 'uma reunião!') - messages.add_message(self.request, messagesself.ERROR, msg) - return {} + comissao = Comissao.objects.get(id=self.kwargs['pk']) + + return {'comissao': comissao} + class DeleteView(MasterDetailCrud.DeleteView, RedirectView): diff --git a/sapl/templates/comissoes/reuniao_list.html b/sapl/templates/comissoes/reuniao_list.html deleted file mode 100644 index 2321a9c78..000000000 --- a/sapl/templates/comissoes/reuniao_list.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "crud/list.html" %} -{% load i18n %} -{% load crispy_forms_tags %} -{% block detail_content %} - - {% if user.is_authenticated and perms.comissoes.add_composicao %} -
- {% 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 %} -{% endblock detail_content %}