diff --git a/sapl/protocoloadm/forms.py b/sapl/protocoloadm/forms.py index 38bc66365..3c8af24ab 100644 --- a/sapl/protocoloadm/forms.py +++ b/sapl/protocoloadm/forms.py @@ -666,9 +666,17 @@ class DocumentoAcessorioAdministrativoForm(FileFieldCheckMixin, 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/protocoloadm/migrations/0027_auto_20191024_1408.py b/sapl/protocoloadm/migrations/0027_auto_20191024_1408.py new file mode 100644 index 000000000..a4262c3a9 --- /dev/null +++ b/sapl/protocoloadm/migrations/0027_auto_20191024_1408.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-10-24 17:08 +from __future__ import unicode_literals + +from django.db import migrations, models +import sapl.utils + + +class Migration(migrations.Migration): + + dependencies = [ + ('protocoloadm', '0026_auto_20191024_1356'), + ] + + operations = [ + migrations.AlterField( + model_name='documentoacessorioadministrativo', + name='arquivo', + field=models.FileField(blank=True, max_length=300, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.utils.texto_upload_path, verbose_name='Arquivo'), + ), + ] diff --git a/sapl/protocoloadm/models.py b/sapl/protocoloadm/models.py index 26dd190ef..9145dfdcc 100644 --- a/sapl/protocoloadm/models.py +++ b/sapl/protocoloadm/models.py @@ -232,7 +232,7 @@ class DocumentoAcessorioAdministrativo(models.Model): verbose_name=_('Tipo')) nome = models.CharField(max_length=30, verbose_name=_('Nome')) arquivo = models.FileField( - max_length=200, + max_length=300, blank=True, null=True, upload_to=texto_upload_path,