diff --git a/sapl/audiencia/forms.py b/sapl/audiencia/forms.py index 280d089ab..f7ced171f 100755 --- a/sapl/audiencia/forms.py +++ b/sapl/audiencia/forms.py @@ -188,8 +188,16 @@ class AnexoAudienciaPublicaForm(forms.ModelForm): arquivo = self.cleaned_data.get('arquivo', False) - if arquivo and arquivo.size > MAX_DOC_UPLOAD_SIZE: - raise ValidationError("O arquivo deve ser menor que {0:.1f} mb, o tamanho atual desse arquivo é {1:.1f} mb" \ - .format((MAX_DOC_UPLOAD_SIZE/1024)/1024, (arquivo.size/1024)/1024)) + if arquivo: + if len(arquivo.name) > 200: + raise ValidationError( + "Certifique-se de que o nome do arquivo no campo 'Arquivo' tenha no máximo 200 " \ + "caracteres (ele possui {})".format(len(arquivo.name)) + ) + if arquivo.size > MAX_DOC_UPLOAD_SIZE: + raise ValidationError( + "O arquivo deve ser menor que {0:.1f} mb, o tamanho atual desse arquivo é " \ + "{1:.1f} mb".format((MAX_DOC_UPLOAD_SIZE/1024)/1024, (arquivo.size/1024)/1024) + ) return self.cleaned_data diff --git a/sapl/audiencia/migrations/0014_auto_20191023_1538.py b/sapl/audiencia/migrations/0014_auto_20191023_1538.py new file mode 100644 index 000000000..4b9cdfbb3 --- /dev/null +++ b/sapl/audiencia/migrations/0014_auto_20191023_1538.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-10-23 18:38 +from __future__ import unicode_literals + +from django.db import migrations, models +import sapl.utils + + +class Migration(migrations.Migration): + + dependencies = [ + ('audiencia', '0013_auto_20191023_1522'), + ] + + operations = [ + migrations.AlterField( + model_name='anexoaudienciapublica', + name='arquivo', + field=models.FileField(max_length=300, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.utils.texto_upload_path, verbose_name='Arquivo'), + ), + ] diff --git a/sapl/audiencia/models.py b/sapl/audiencia/models.py index 4299be736..d4c1b11cb 100755 --- a/sapl/audiencia/models.py +++ b/sapl/audiencia/models.py @@ -167,7 +167,7 @@ class AnexoAudienciaPublica(models.Model): audiencia = models.ForeignKey(AudienciaPublica, on_delete=models.PROTECT) arquivo = models.FileField( - max_length=200, + max_length=300, upload_to=texto_upload_path, storage=OverwriteStorage(), verbose_name=_('Arquivo'))