From c5f5027df3f6be122c93c6d53d29241c010d89f0 Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Mon, 28 Jan 2019 15:40:38 -0200 Subject: [PATCH] readonly em edicao do nome e sigla do partido atraves do editar --- sapl/base/forms.py | 15 ++++++++++++++- sapl/parlamentares/forms.py | 6 +++--- sapl/parlamentares/views.py | 19 ++++++++++++++++--- .../parlamentares/partido_detail.html | 1 + 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/sapl/base/forms.py b/sapl/base/forms.py index d603ffc45..ac7d4e2a2 100644 --- a/sapl/base/forms.py +++ b/sapl/base/forms.py @@ -27,7 +27,7 @@ from sapl.audiencia.models import AudienciaPublica,TipoAudienciaPublica from sapl.comissoes.models import Reuniao, Comissao from sapl.materia.models import (MateriaLegislativa, UnidadeTramitacao, StatusTramitacao) from sapl.norma.models import (NormaJuridica, NormaEstatisticas) -from sapl.parlamentares.models import SessaoLegislativa +from sapl.parlamentares.models import SessaoLegislativa, Partido from sapl.sessao.models import SessaoPlenaria from sapl.settings import MAX_IMAGE_UPLOAD_SIZE from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES, @@ -1317,3 +1317,16 @@ class AlterarSenhaForm(Form): "Nova senha não pode ser igual à senha anterior") return self.cleaned_data + +class PartidoForm(ModelForm): + + class Meta: + model = Partido + exclude = [] + + def __init__(self, *args, **kwargs): + + super(PartidoForm, self).__init__(*args, **kwargs) + + self.fields['nome'].widget.attrs['readonly'] = True + self.fields['sigla'].widget.attrs['readonly'] = True diff --git a/sapl/parlamentares/forms.py b/sapl/parlamentares/forms.py index 08d2acf41..dfa03490f 100755 --- a/sapl/parlamentares/forms.py +++ b/sapl/parlamentares/forms.py @@ -506,9 +506,9 @@ class EditarNomePartidoForm(forms.Form): def __init__(self, *args, **kwargs): super(EditarNomePartidoForm, self).__init__(*args, **kwargs) - row1 = to_row([('sigla', 12)]) - row2 = to_row([('nome', 6)]) - row3 = to_row([('data_alteracao', 12)]) + row1 = to_row([('sigla', 2)]) + row2 = to_row([('nome', 8)]) + row3 = to_row([('data_alteracao', 2)]) self.helper = FormHelper() self.helper.layout = SaplFormLayout( diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py index 508a15dcc..495a5599c 100644 --- a/sapl/parlamentares/views.py +++ b/sapl/parlamentares/views.py @@ -19,7 +19,7 @@ from django.views.decorators.clickjacking import xframe_options_exempt from django.views.generic import FormView from django.views.generic.edit import UpdateView -from sapl.base.forms import SessaoLegislativaForm +from sapl.base.forms import SessaoLegislativaForm, PartidoForm from sapl.base.models import Autor from sapl.comissoes.models import Participacao from sapl.crud.base import (RP_CHANGE, RP_DETAIL, RP_LIST, Crud, CrudAux, @@ -39,7 +39,7 @@ from .models import (CargoMesa, Coligacao, ComposicaoColigacao, ComposicaoMesa, CargoMesaCrud = CrudAux.build(CargoMesa, 'cargo_mesa') -PartidoCrud = CrudAux.build(Partido, 'partidos') +# PartidoCrud = CrudAux.build(Partido, 'partidos') TipoDependenteCrud = CrudAux.build(TipoDependente, 'tipo_dependente') NivelInstrucaoCrud = CrudAux.build(NivelInstrucao, 'nivel_instrucao') TipoAfastamentoCrud = CrudAux.build(TipoAfastamento, 'tipo_afastamento') @@ -58,6 +58,13 @@ class SessaoLegislativaCrud(CrudAux): form_class = SessaoLegislativaForm +class PartidoCrud(CrudAux): + model = Partido + + class UpdateView(CrudAux.UpdateView): + form_class = PartidoForm + + class VotanteView(MasterDetailCrud): model = Votante parent_field = 'parlamentar' @@ -758,11 +765,17 @@ class MesaDiretoraView(FormView): class EditaNomePartidoView(PermissionRequiredMixin, FormView): form_class = EditarNomePartidoForm template_name = 'parlamentares/altera_nome_partido_form.html' - success_url = reverse_lazy('sapl.parlamentares:altera_nome_partido') permission_required = ('parlamentares.altera_nome_partido',) def form_valid(self, form): + import ipdb; ipdb.set_trace() return super().form_valid(form) + + def get_success_url(self): + url_reverse = reverse('sapl.parlamentares:partido_detail', + kwargs={'pk': self.kwargs['pk']}) + + return url_reverse def altera_field_mesa(request): diff --git a/sapl/templates/parlamentares/partido_detail.html b/sapl/templates/parlamentares/partido_detail.html index 12d0c0bd5..e6ec0891a 100644 --- a/sapl/templates/parlamentares/partido_detail.html +++ b/sapl/templates/parlamentares/partido_detail.html @@ -4,6 +4,7 @@ {% block actions %} {{ block.super }} +
{% trans 'Alterar o nome do partido' %}