Browse Source

Merge branch '3.1.x' into painel

pull/3814/head
Heitor 4 days ago
committed by GitHub
parent
commit
52ed1db125
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      sapl/audiencia/forms.py
  2. 5
      sapl/utils.py

2
sapl/audiencia/forms.py

@ -115,7 +115,7 @@ class AudienciaForm(FileFieldCheckMixin, forms.ModelForm):
numero=materia, numero=materia,
ano=ano_materia, ano=ano_materia,
tipo=tipo_materia) tipo=tipo_materia)
except ObjectDoesNotExist: except (ObjectDoesNotExist, ValueError):
msg = _('A matéria %s%s/%s não existe no cadastro' msg = _('A matéria %s%s/%s não existe no cadastro'
' de matérias legislativas.' % (tipo_materia, materia, ano_materia)) ' de matérias legislativas.' % (tipo_materia, materia, ano_materia))
self.logger.warning( self.logger.warning(

5
sapl/utils.py

@ -1395,8 +1395,9 @@ class MultiFormatOutputMixin:
return {fmt: fields for fmt in self.formats_impl} return {fmt: fields for fmt in self.formats_impl}
def render_to_response(self, context, **response_kwargs): def render_to_response(self, context, **response_kwargs):
format_result = getattr(self.request, self.request.method).get( # HEAD shares query params with GET; Django has no request.HEAD attribute.
'format', None) _method = 'GET' if self.request.method == 'HEAD' else self.request.method
format_result = getattr(self.request, _method).get('format', None)
if format_result: if format_result:
if format_result not in self.formats_impl: if format_result not in self.formats_impl:

Loading…
Cancel
Save