From 2a732d96959171f0a4fd976883216ec9bc77f2f7 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Mon, 10 Jul 2017 18:51:08 -0300 Subject: [PATCH] Fixes #1265 --- sapl/materia/forms.py | 12 +++++++++--- sapl/templates/materia/layouts.yaml | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 47eabe43b..4897ac318 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -13,7 +13,7 @@ from django.core.files.base import File from django.core.urlresolvers import reverse from django.db import models, transaction from django.db.models import Max -from django.forms import ModelForm, widgets +from django.forms import ModelForm, ModelChoiceField, widgets from django.forms.forms import Form from django.forms.widgets import Select from django.utils.encoding import force_text @@ -22,7 +22,7 @@ from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ import django_filters -from sapl.base.models import Autor +from sapl.base.models import Autor, TipoAutor from sapl.comissoes.models import Comissao from sapl.compilacao.models import (STATUS_TA_IMMUTABLE_PUBLIC, STATUS_TA_PRIVATE) @@ -648,9 +648,15 @@ class DespachoInicialForm(ModelForm): class AutoriaForm(ModelForm): + tipo_autor = ModelChoiceField(label=_('Tipo Autor'), + required=True, + queryset= + TipoAutor.objects.all().order_by('descricao'), + empty_label='Selecione',) + class Meta: model = Autoria - fields = ['autor', 'primeiro_autor'] + fields = ['tipo_autor', 'autor', 'primeiro_autor'] def clean(self): super(AutoriaForm, self).clean() diff --git a/sapl/templates/materia/layouts.yaml b/sapl/templates/materia/layouts.yaml index 6045d61d9..c8a69889e 100644 --- a/sapl/templates/materia/layouts.yaml +++ b/sapl/templates/materia/layouts.yaml @@ -59,7 +59,7 @@ AnexadaDetail: Autoria: {% trans 'Autoria' %}: - - autor primeiro_autor + - tipo_autor autor primeiro_autor DocumentoAcessorio: {% trans 'Documento Acessório' %}: