From 7bb7a03b38c5236cb3899da5c1ee1ef8a2d3bec5 Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Mon, 26 Feb 2018 10:45:39 -0300 Subject: [PATCH] Troca Crud por MasterCrudDetail --- sapl/comissoes/forms.py | 3 +-- sapl/comissoes/views.py | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sapl/comissoes/forms.py b/sapl/comissoes/forms.py index f8940485b..1ab887adc 100644 --- a/sapl/comissoes/forms.py +++ b/sapl/comissoes/forms.py @@ -6,10 +6,9 @@ from django.db.models import Q from django.forms import ModelForm from django.utils.translation import ugettext_lazy as _ from sapl.base.models import Autor, TipoAutor -from sapl.comissoes.models import Comissao, Composicao, Participacao +from sapl.comissoes.models import Comissao, Composicao, Participacao, Reuniao from sapl.parlamentares.models import Legislatura, Mandato, Parlamentar -from .models import Reuniao class ParticipacaoCreateForm(forms.ModelForm): diff --git a/sapl/comissoes/views.py b/sapl/comissoes/views.py index 86bd59053..249b49899 100644 --- a/sapl/comissoes/views.py +++ b/sapl/comissoes/views.py @@ -147,12 +147,12 @@ class MateriasTramitacaoListView(ListView): context['object'] = Comissao.objects.get(id=self.kwargs['pk']) return context -class ReuniaoCrud(Crud): +class ReuniaoCrud(MasterDetailCrud): model = Reuniao parent_field = 'comissao' public = [RP_LIST, RP_DETAIL, ] - class BaseMixin(Crud.BaseMixin): + class BaseMixin(MasterDetailCrud.BaseMixin): list_field_names = ['data', 'comissao', 'tipo'] @property @@ -164,7 +164,7 @@ class ReuniaoCrud(Crud): namespace = self.model._meta.app_config.name return reverse('%s:%s' % (namespace, 'pesquisar_reuniao')) - class ListView(Crud.ListView): + class ListView(MasterDetailCrud.ListView): template_name = "comissoes/reuniao_list.html" paginate_by = None @@ -191,14 +191,14 @@ class ReuniaoCrud(Crud): return context - class UpdateView(Crud.UpdateView): + class UpdateView(MasterDetailCrud.UpdateView): form_class = ReuniaoForm def get_initial(self): return {'comissao': self.object.comissao} - class CreateView(Crud.CreateView): + class CreateView(MasterDetailCrud.CreateView): form_class = ReuniaoForm @@ -218,7 +218,7 @@ class ReuniaoCrud(Crud): messages.add_message(self.request, messagesself.ERROR, msg) return {} - class DeleteView(Crud.DeleteView, RedirectView): + class DeleteView(MasterDetailCrud.DeleteView, RedirectView): def get_success_url(self): namespace = self.model._meta.app_config.name