From 36c5c2cfafb5bbbd2fae9002b200ca83e6606c5d Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Tue, 11 Jul 2017 15:04:56 -0300 Subject: [PATCH] WIP --- sapl/materia/forms.py | 14 +++++++++++++- sapl/materia/views.py | 4 ++++ sapl/templates/materia/layouts.yaml | 8 ++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index e1af3d1cc..b88df390f 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -649,11 +649,23 @@ class DespachoInicialForm(ModelForm): class AutoriaForm(ModelForm): tipo_autor = ModelChoiceField(label=_('Tipo Autor'), - required=True, + required=False, queryset= TipoAutor.objects.all().order_by('descricao'), empty_label='Selecione',) + def __init__(self, *args, **kwargs): + super(AutoriaForm, self).__init__(*args, **kwargs) + + row1 = to_row([('tipo_autor', 4), + ('autor', 4), + ('primeiro_autor', 4)]) + + self.helper = FormHelper() + self.helper.layout = Layout( + Fieldset(_('Autoria'), + row1, form_actions(save_label='Salvar'))) + class Meta: model = Autoria fields = ['tipo_autor', 'autor', 'primeiro_autor'] diff --git a/sapl/materia/views.py b/sapl/materia/views.py index f4b6c4e35..f12ed883e 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1077,6 +1077,10 @@ class AutoriaCrud(MasterDetailCrud): class CreateView(MasterDetailCrud.CreateView): form_class = AutoriaForm + @property + def layout_key(self): + return 'AutoriaCreate' + def get_context_data(self, **kwargs): context = super(CreateView, self).get_context_data(**kwargs) autores_ativos = self.autores_ativos() diff --git a/sapl/templates/materia/layouts.yaml b/sapl/templates/materia/layouts.yaml index c8a69889e..aac494432 100644 --- a/sapl/templates/materia/layouts.yaml +++ b/sapl/templates/materia/layouts.yaml @@ -58,6 +58,14 @@ AnexadaDetail: - data_anexacao data_desanexacao Autoria: + {% trans 'Autoria' %}: + - autor primeiro_autor + +AutoriaCreate: + {% trans 'Autoria' %}: + - tipo_autor autor primeiro_autor + +AutoriaUpdate: {% trans 'Autoria' %}: - tipo_autor autor primeiro_autor