From d1a924bceecff5b702f2f3cbf51ee4b899e4aec8 Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Tue, 3 May 2016 11:48:05 -0300
Subject: [PATCH] Init crud relatoria

---
 materia/urls.py  | 7 +++++++
 materia/views.py | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/materia/urls.py b/materia/urls.py
index b04161fb6..3d197d21b 100644
--- a/materia/urls.py
+++ b/materia/urls.py
@@ -55,6 +55,13 @@ urlpatterns = [
     url(r'^sistema/materia/status-tramitacao/',
         include(StatusTramitacaoCrud.get_urls())),
     url(r'^sistema/materia/orgao/', include(OrgaoCrud.get_urls())),
+<<<<<<< 87cd7406270bf42bacab49bf32b87b7c838c72d0
+=======
+    url(r'^materia/(?P<pk>\d+)/documento-acessorio$',
+        DocumentoAcessorioView.as_view(), name='documento_acessorio'),
+    url(r'^materia/(?P<pk>\d+)/documento-acessorio/(?P<id>\d+)/edit',
+        DocumentoAcessorioEditView.as_view(), name='documento_acessorio_edit'),
+>>>>>>> Init crud relatoria
     url(r'^materia/proposicao$',
         ProposicaoView.as_view(), name='adicionar_proposicao'),
     url(r'^materia/proposicao_list$',
diff --git a/materia/views.py b/materia/views.py
index 8c2dc3a17..a8e73ca4b 100644
--- a/materia/views.py
+++ b/materia/views.py
@@ -57,6 +57,8 @@ ProposicaoCrud = Crud.build(Proposicao, '')
 StatusTramitacaoCrud = Crud.build(StatusTramitacao, 'status_tramitacao')
 UnidadeTramitacaoCrud = Crud.build(UnidadeTramitacao, 'unidade_tramitacao')
 
+RelatoriaCrud = MasterDetailCrud.build(Relatoria, 'materia', '')
+
 
 class RelatoriaCrud(MasterDetailCrud):
     model = Relatoria