From ef5c084aa16d60ec955dca812481025f0b539b99 Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Mon, 3 Apr 2017 16:04:23 -0300
Subject: [PATCH] Bug fix

---
 sapl/materia/forms.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py
index 50a11c31b..7c0b6d8c8 100644
--- a/sapl/materia/forms.py
+++ b/sapl/materia/forms.py
@@ -29,8 +29,8 @@ from sapl.compilacao.models import (STATUS_TA_IMMUTABLE_PUBLIC,
                                     STATUS_TA_PRIVATE)
 from sapl.crispy_layout_mixin import (SaplFormLayout, form_actions, to_column,
                                       to_row)
-from sapl.materia.models import (MateriaAssunto, MateriaLegislativa,
-                                 RegimeTramitacao,
+from sapl.materia.models import (AssuntoMateria, MateriaAssunto,
+                                 MateriaLegislativa, RegimeTramitacao,
                                  TipoDocumento, TipoProposicao)
 from sapl.norma.models import (LegislacaoCitada, NormaJuridica,
                                TipoNormaJuridica)
@@ -494,8 +494,8 @@ class MateriaLegislativaFilterSet(django_filters.FilterSet):
                                                 label=u'Em tramitação',
                                                 choices=em_tramitacao)
 
-    materiaassunto = django_filters.ModelChoiceFilter(
-        queryset=MateriaAssunto.objects.all(),
+    materiaassunto__assunto = django_filters.ModelChoiceFilter(
+        queryset=AssuntoMateria.objects.all(),
         label=_('Assunto da Matéria'))
 
     o = MateriaPesquisaOrderingFilter()
@@ -514,7 +514,7 @@ class MateriaLegislativaFilterSet(django_filters.FilterSet):
                   'local_origem_externa',
                   'tramitacao__unidade_tramitacao_destino',
                   'tramitacao__status',
-                  'materiaassunto',
+                  'materiaassunto__assunto',
                   'em_tramitacao',
                   ]
 
@@ -557,7 +557,7 @@ class MateriaLegislativaFilterSet(django_filters.FilterSet):
             [('em_tramitacao', 6),
              ('o', 6)])
         row9 = to_row(
-            [('materiaassunto', 12)])
+            [('materiaassunto__assunto', 12)])
         row10 = to_row(
             [('ementa', 12)])