diff --git a/.gitignore b/.gitignore index 65fefe18f..18557c784 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,6 @@ collected_static bower bower_components media + +#merge garbage +.orig \ No newline at end of file diff --git a/materia/forms.py b/materia/forms.py index f48090fce..ed06180cb 100644 --- a/materia/forms.py +++ b/materia/forms.py @@ -641,7 +641,7 @@ class MateriaLegislativaPesquisaFields(FilterSet): empty_label='Selecione', help_text="") - relatoria__parlamentar__id = django_filters.ModelChoiceFilter( + relatoria__parlamentar_id = django_filters.ModelChoiceFilter( label='Relator', required=False, queryset=Parlamentar.objects.all().order_by('nome_parlamentar'),