diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 1d223de8f..58e9fa3d1 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -1126,39 +1126,17 @@ def filtra_tramitacao_destino_and_status(status, destino): class DespachoInicialCreateForm(forms.Form): comissao = forms.ModelMultipleChoiceField( queryset=Comissao.objects.filter(ativa=True), - widget=forms.CheckboxSelectMultiple()) - - class Meta: - model = DespachoInicial - fields = ['comissao'] + widget=forms.CheckboxSelectMultiple(), + label=Comissao._meta.verbose_name_plural) def __init__(self, *args, **kwargs): - # import ipdb; ipdb.set_trace() - # kwargs.pop('instance') - self.fields['comissao'].label = 'Comissões' - # self.helper = FormHelper(self) - # self.helper.form_method = 'POST' - - # self.helper.layout = Layout( - # Div( - # Div('comissao', css_class="col-md-12"), - # Div(FormActions( - # Submit('salvar', 'Salvar', css_class='btn btn-primary ml-5 mt-3 float-left'), - # ) - # ), - # css_class='row', - # )) - - # super().__init__(*args, **kwargs) - # kwargs.pop('instance') row1 = to_row( [('comissao', 12), ]) - self.form.helper = SaplFormHelper() - self.form.helper.form_method = 'POST' - self.form.helper.layout = Layout( - Fieldset(_('Pesquisa Básica'), - row1)) + self.helper = SaplFormHelper() + self.helper.form_method = 'POST' + self.helper.layout = SaplFormLayout(row1) + super().__init__(*args, **kwargs) def clean(self): super().clean() diff --git a/sapl/materia/urls.py b/sapl/materia/urls.py index 1b1297dcb..2fe9145de 100644 --- a/sapl/materia/urls.py +++ b/sapl/materia/urls.py @@ -65,6 +65,12 @@ urlpatterns_impressos = [ urlpatterns_materia = [ + # Esta customização substitui a url do crud desque que ela permaneça antes + # da inclusão das urls de DespachoInicialCrud + url(r'^materia/(?P\d+)/despachoinicial/create', + DespachoInicialMultiCreateView.as_view(), + name='despacho-inicial-multi'), + url(r'^materia/', include(MateriaLegislativaCrud.get_urls() + AnexadaCrud.get_urls() + AutoriaCrud.get_urls() + diff --git a/sapl/materia/views.py b/sapl/materia/views.py index bf51a1ee0..3da6b84f6 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1539,39 +1539,6 @@ class DespachoInicialCrud(MasterDetailCrud): class UpdateView(MasterDetailCrud.UpdateView): form_class = DespachoInicialForm - class CreateView(MasterDetailCrud.CreateView): - form_class = DespachoInicialCreateForm - template_name = 'materia/despachoinicial_multicreate_form.html' - - def get_initial(self): - initial = super().get_initial() - self.materia = MateriaLegislativa.objects.get(id=self.kwargs['pk']) - initial['materia'] = self.materia - return initial - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context['title'] = '%s (%s)' % ( - _('Adicionar Vários Despachos'), self.materia) - context['root_pk'] = self.kwargs['pk'] - context['subnav_template_name'] = 'materia/subnav.yaml' - return context - - def get_success_url(self): - messages.add_message( - self.request, messages.SUCCESS, - _('Despachos adicionados com sucesso.')) - return reverse( - 'sapl.materia:despachoinicial_list', kwargs={'pk': self.materia.pk}) - - def form_valid(self, form): - comissoes_selecionadas = form.cleaned_data['comissao'] - for comissao in comissoes_selecionadas: - DespachoInicial.objects.create( - materia=self.materia, comissao=comissao) - - return FormView.form_valid(self, form) - class LegislacaoCitadaCrud(MasterDetailCrud): model = LegislacaoCitada diff --git a/sapl/templates/materia/despachoinicial_list.html b/sapl/templates/materia/despachoinicial_list.html deleted file mode 100644 index 2ac524d4c..000000000 --- a/sapl/templates/materia/despachoinicial_list.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "crud/list.html" %} -{% load i18n common_tags crispy_forms_tags%} - -{% block extra_js %} - -{% endblock %} \ No newline at end of file