From 9851cbbd9ff029da90adfb6ced0efe2bf61d5fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= Date: Tue, 29 Oct 2019 14:51:18 -0300 Subject: [PATCH] Fix #3022 - JustificativaAusencia --- sapl/sessao/forms.py | 18 ++++++++++++--- .../migrations/0050_auto_20191029_1441.py | 22 +++++++++++++++++++ sapl/sessao/models.py | 2 +- 3 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 sapl/sessao/migrations/0050_auto_20191029_1441.py diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py index 902583bac..b384677b5 100644 --- a/sapl/sessao/forms.py +++ b/sapl/sessao/forms.py @@ -1079,9 +1079,21 @@ class JustificativaAusenciaForm(ModelForm): upload_anexo = self.cleaned_data.get('upload_anexo', False) - if upload_anexo and upload_anexo.size > MAX_DOC_UPLOAD_SIZE: - raise ValidationError("O arquivo Anexo de Justificativa deve ser menor que {0:.1f} mb, o tamanho atual desse arquivo é {1:.1f} mb" \ - .format((MAX_DOC_UPLOAD_SIZE/1024)/1024, (upload_anexo.size/1024)/1024)) + if upload_anexo: + if len(upload_anexo.name) > 200: + raise ValidationError( + "Certifique-se de que o nome do arquivo no campo " \ + "'Anexo de Justificativa' tenha no máximo 200 caracteres " \ + "(ele possui {})".format(len(upload_anexo.name)) + ) + if upload_anexo.size > MAX_DOC_UPLOAD_SIZE: + raise ValidationError( + "O arquivo Anexo de Justificativa deve ser menor que {0:.1f} mb, o " \ + "tamanho atual desse arquivo é {1:.1f} mb".format( + (MAX_DOC_UPLOAD_SIZE/1024)/1024, + (upload_anexo.size/1024)/1024 + ) + ) if not sessao_plenaria.finalizada or sessao_plenaria.finalizada is None: raise ValidationError( diff --git a/sapl/sessao/migrations/0050_auto_20191029_1441.py b/sapl/sessao/migrations/0050_auto_20191029_1441.py new file mode 100644 index 000000000..6fd2ee4d6 --- /dev/null +++ b/sapl/sessao/migrations/0050_auto_20191029_1441.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-10-29 17:41 +from __future__ import unicode_literals + +from django.db import migrations, models +import sapl.sessao.models +import sapl.utils + + +class Migration(migrations.Migration): + + dependencies = [ + ('sessao', '0049_auto_20191029_1434'), + ] + + operations = [ + migrations.AlterField( + model_name='justificativaausencia', + name='upload_anexo', + field=models.FileField(blank=True, max_length=300, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.sessao.models.anexo_upload_path, verbose_name='Anexo de Justificativa'), + ), + ] diff --git a/sapl/sessao/models.py b/sapl/sessao/models.py index 65168d638..2df6e1a14 100644 --- a/sapl/sessao/models.py +++ b/sapl/sessao/models.py @@ -788,7 +788,7 @@ class JustificativaAusencia(models.Model): OrdemDia, blank=True, verbose_name=_('Matérias do Ordem do Dia')) upload_anexo = models.FileField( - max_length=200, + max_length=300, blank=True, null=True, storage=OverwriteStorage(),