diff --git a/protocoloadm/urls.py b/protocoloadm/urls.py index de369ae25..8a8dfb97c 100644 --- a/protocoloadm/urls.py +++ b/protocoloadm/urls.py @@ -5,6 +5,7 @@ from protocoloadm.views import (AnularProtocoloAdmView, DocumentoAcessorioAdministrativoView, PesquisarDocumentoAdministrativo, ProposicaoReceberView, ProposicaoView, + ProposicaoDetailView, ProposicoesIncorporadasView, ProposicoesNaoIncorporadasView, ProposicoesNaoRecebidasView, @@ -65,17 +66,19 @@ urlpatterns = [ # TODO: move to Proposicoes app - url(r'^protocoloadm/proposicao-receber', + url(r'^proposicoes$', + ProposicaoView.as_view(), name='proposicao'), + url(r'^proposicoes/proposicao-receber', ProposicaoReceberView.as_view(), name='proposicao_receber'), - url(r'^protocoloadm/proposicoes-naorecebidas', + url(r'^proposicoes/proposicoes-naorecebidas', ProposicoesNaoRecebidasView.as_view(), name='proposicoes_naorecebidas'), - url(r'^protocoloadm/proposicoes-naoincorporadas', + url(r'^proposicoes/proposicoes-naoincorporadas', ProposicoesNaoIncorporadasView.as_view(), name='proposicoes_naoincorporadas'), - url(r'^protocoloadm/proposicoes-incorporadas', + url(r'^proposicoes/proposicoes-incorporadas', ProposicoesIncorporadasView.as_view(), name='proposicoes_incorporadas'), - url(r'^protocoloadm/(?P\d+)/proposicao', - ProposicaoView.as_view(), name='proposicao_view'), + url(r'^proposicoes/(?P\d+)/proposicao', + ProposicaoDetailView.as_view(), name='proposicao_view'), ] diff --git a/protocoloadm/views.py b/protocoloadm/views.py index 25f74f18d..b669ce60c 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -590,7 +590,10 @@ class ProposicaoSimpleForm(forms.Form): # attrs={'readonly':'readonly'})) -class ProposicaoView(DetailView): +class ProposicaoView(TemplateView): + template_name = "protocoloadm/proposicoes.html" + +class ProposicaoDetailView(DetailView): template_name = "protocoloadm/proposicao_view.html" model = Proposicao diff --git a/templates/base.html b/templates/base.html index 4e96fe0c8..a21fd9e3c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -72,7 +72,7 @@ - +