Browse Source

FIX #1968

pull/2017/head
Mariana Mendes 8 years ago
parent
commit
35000887e3
  1. 4
      sapl/sessao/urls.py
  2. 8
      sapl/sessao/views.py
  3. 7
      sapl/templates/sessao/impressos/resumo_pdf.html

4
sapl/sessao/urls.py

@ -4,7 +4,6 @@ from sapl.sessao.views import (AdicionarVariasMateriasExpediente,
AdicionarVariasMateriasOrdemDia, BancadaCrud, AdicionarVariasMateriasOrdemDia, BancadaCrud,
BlocoCrud, CargoBancadaCrud, BlocoCrud, CargoBancadaCrud,
ExpedienteMateriaCrud, ExpedienteView, ExpedienteMateriaCrud, ExpedienteView,
ImpressosView,
MateriaOrdemDiaCrud, MesaView, OradorCrud, MateriaOrdemDiaCrud, MesaView, OradorCrud,
OradorExpedienteCrud, PainelView, OradorExpedienteCrud, PainelView,
PautaSessaoDetailView, PautaSessaoView, PautaSessaoDetailView, PautaSessaoView,
@ -152,7 +151,4 @@ urlpatterns = [
url(r'^sessao/mudar-ordem-materia-sessao/', url(r'^sessao/mudar-ordem-materia-sessao/',
mudar_ordem_materia_sessao, mudar_ordem_materia_sessao,
name='mudar_ordem_materia_sessao'), name='mudar_ordem_materia_sessao'),
url(r'^sessao/impressos/$',
ImpressosView.as_view(),
name='impressos'),
] ]

8
sapl/sessao/views.py

@ -1191,7 +1191,7 @@ def get_turno(turno):
class ResumoView(DetailView): class ResumoView(DetailView):
template_name = 'sessao/resumo.html' template_name = 'impressos/sessao/resumo.html'
model = SessaoPlenaria model = SessaoPlenaria
permission_required = ('sessao.can_access_impressos', ) permission_required = ('sessao.can_access_impressos', )
@ -2880,10 +2880,6 @@ def mudar_ordem_materia_sessao(request):
return 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): def gerar_pdf_impressos(request, context, template_name):
template = loader.get_template(template_name) template = loader.get_template(template_name)
html = template.render(RequestContext(request, context)) 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 = HttpResponse(pdf, content_type='application/pdf')
response['Content-Disposition'] = ( response['Content-Disposition'] = (
'inline; filename="relatorio_impressos.pdf"') 'inline; filename="resumo_sessao.pdf"')
response['Content-Transfer-Encoding'] = 'binary' response['Content-Transfer-Encoding'] = 'binary'
return response return response

7
sapl/templates/sessao/impressos/resumo_pdf.html

@ -28,13 +28,6 @@
{% load i18n %} {% load i18n %}
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
{% block title %}
<h1 class="page-header">
Resumo <small>({{sessaoplenaria}})</small>
<br/>
</h1>
{% endblock %}
{% block detail_content %} {% block detail_content %}
{% include 'sessao/blocos_resumo/'|add:primeiro_ordenacao %} {% include 'sessao/blocos_resumo/'|add:primeiro_ordenacao %}

Loading…
Cancel
Save