diff --git a/sapl/sessao/urls.py b/sapl/sessao/urls.py index fa22b7f90..d423587b3 100644 --- a/sapl/sessao/urls.py +++ b/sapl/sessao/urls.py @@ -4,7 +4,6 @@ from sapl.sessao.views import (AdicionarVariasMateriasExpediente, AdicionarVariasMateriasOrdemDia, BancadaCrud, BlocoCrud, CargoBancadaCrud, ExpedienteMateriaCrud, ExpedienteView, - ImpressosView, MateriaOrdemDiaCrud, MesaView, OradorCrud, OradorExpedienteCrud, PainelView, PautaSessaoDetailView, PautaSessaoView, @@ -152,7 +151,4 @@ urlpatterns = [ url(r'^sessao/mudar-ordem-materia-sessao/', mudar_ordem_materia_sessao, name='mudar_ordem_materia_sessao'), - url(r'^sessao/impressos/$', - ImpressosView.as_view(), - name='impressos'), ] diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 3dea7ed75..73bbf871e 100644 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -1191,7 +1191,7 @@ def get_turno(turno): class ResumoView(DetailView): - template_name = 'sessao/resumo.html' + template_name = 'impressos/sessao/resumo.html' model = SessaoPlenaria permission_required = ('sessao.can_access_impressos', ) @@ -2880,10 +2880,6 @@ def mudar_ordem_materia_sessao(request): return -class ImpressosView(PermissionRequiredMixin, TemplateView): - template_name = 'sessao/impressos/resumo.html' - permission_required = ('sessao.can_access_impressos', ) - def gerar_pdf_impressos(request, context, template_name): template = loader.get_template(template_name) html = template.render(RequestContext(request, context)) @@ -2893,7 +2889,7 @@ def gerar_pdf_impressos(request, context, template_name): response = HttpResponse(pdf, content_type='application/pdf') response['Content-Disposition'] = ( - 'inline; filename="relatorio_impressos.pdf"') + 'inline; filename="resumo_sessao.pdf"') response['Content-Transfer-Encoding'] = 'binary' return response diff --git a/sapl/templates/sessao/impressos/resumo_pdf.html b/sapl/templates/sessao/impressos/resumo_pdf.html index c13634093..66958b2fd 100644 --- a/sapl/templates/sessao/impressos/resumo_pdf.html +++ b/sapl/templates/sessao/impressos/resumo_pdf.html @@ -28,13 +28,6 @@ {% load i18n %} {% load crispy_forms_tags %} -{% block title %} -

- Resumo ({{sessaoplenaria}}) -
-

-{% endblock %} - {% block detail_content %} {% include 'sessao/blocos_resumo/'|add:primeiro_ordenacao %}