Browse Source

Corrige erro ao mostrar detalhes de audiência

pull/1743/head
João Pedro Sconetto 8 years ago
parent
commit
80d55baa4a
  1. 13
      sapl/audiencia/forms.py
  2. 8
      sapl/audiencia/views.py
  3. 12
      sapl/templates/audiencia/layouts.yaml

13
sapl/audiencia/forms.py

@ -1,5 +1,5 @@
from django import forms from django import forms
from django.core.exceptions import ValidationError from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.db import transaction from django.db import transaction
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from sapl.audiencia.models import AudienciaPublica, TipoAudienciaPublica from sapl.audiencia.models import AudienciaPublica, TipoAudienciaPublica
@ -31,7 +31,12 @@ class AudienciaForm(forms.ModelForm):
class Meta: class Meta:
model = AudienciaPublica model = AudienciaPublica
fields = '__all__' fields = ['tipo', 'numero', 'nome',
'tema', 'data', 'hora_inicio', 'hora_fim',
'observacao', 'audiencia_cancelada', 'url_audio',
'url_video', 'upload_pauta', 'upload_ata',
'upload_anexo', 'tipo_materia', 'numero_materia',
'ano_materia']
def __init__(self, **kwargs): def __init__(self, **kwargs):
@ -50,7 +55,9 @@ class AudienciaForm(forms.ModelForm):
def clean(self): def clean(self):
super(AudienciaForm, self).clean() cleaned_data = super(AudienciaForm, self).clean()
if not self.is_valid():
return cleaned_data
try: try:
materia = MateriaLegislativa.objects.get( materia = MateriaLegislativa.objects.get(

8
sapl/audiencia/views.py

@ -34,12 +34,20 @@ class AudienciaCrud(Crud):
class UpdateView(Crud.UpdateView): class UpdateView(Crud.UpdateView):
form_class = AudienciaForm form_class = AudienciaForm
def get_initial(self):
self.initial['tipo_materia'] = self.object.materia.tipo.id
self.initial['numero_materia'] = self.object.materia.numero
self.initial['ano_materia'] = self.object.materia.ano
return self.initial
class DeleteView(Crud.DeleteView): class DeleteView(Crud.DeleteView):
pass pass
class DetailView(Crud.DetailView): class DetailView(Crud.DetailView):
layout_key = 'AudienciaPublicaDetail'
@xframe_options_exempt @xframe_options_exempt
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
return super().get(request, *args, **kwargs) return super().get(request, *args, **kwargs)

12
sapl/templates/audiencia/layouts.yaml

@ -10,3 +10,15 @@ AudienciaPublica:
- upload_pauta upload_ata upload_anexo - upload_pauta upload_ata upload_anexo
- observacao - observacao
- audiencia_cancelada - audiencia_cancelada
AudienciaPublicaDetail:
{% trans 'Audiência Pública' %}:
- nome:10 numero
- tema
{% trans 'Dados' %}:
- materia tipo
- data hora_inicio hora_fim
- url_audio url_video
- upload_pauta upload_ata upload_anexo
- observacao
- audiencia_cancelada
Loading…
Cancel
Save