From 63c7e14afbe2fe9a4642c15b82ae91f8f145862f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= Date: Thu, 24 Oct 2019 13:23:17 -0300 Subject: [PATCH] Fix #3022 - Proposicao --- sapl/materia/forms.py | 14 +++++++++--- .../migrations/0063_auto_20191024_1313.py | 22 +++++++++++++++++++ sapl/materia/models.py | 2 +- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 sapl/materia/migrations/0063_auto_20191024_1313.py diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 57850135f..5fb24ea58 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -1957,9 +1957,17 @@ class ProposicaoForm(FileFieldCheckMixin, forms.ModelForm): def clean_texto_original(self): texto_original = self.cleaned_data.get('texto_original', False) - if texto_original and texto_original.size > MAX_DOC_UPLOAD_SIZE: - raise ValidationError("O arquivo Texto Original deve ser menor que {0:.1f} mb, o tamanho atual desse arquivo é {1:.1f} mb" - .format((MAX_DOC_UPLOAD_SIZE / 1024) / 1024, (texto_original.size / 1024) / 1024)) + if texto_original: + if len(texto_original.name) > 200: + raise ValidationError( + "Certifique-se de que o nome do arquivo no campo 'Texto Original' tenha no máximo 200 " \ + "caracteres (ele possui {})".format(len(texto_original.name)) + ) + if texto_original.size > MAX_DOC_UPLOAD_SIZE: + raise ValidationError( + "O arquivo Texto Original deve ser menor que {0:.1f} mb, o tamanho atual desse arquivo é " \ + "{1:.1f} mb".format((MAX_DOC_UPLOAD_SIZE / 1024) / 1024, (texto_original.size / 1024) / 1024) + ) return texto_original diff --git a/sapl/materia/migrations/0063_auto_20191024_1313.py b/sapl/materia/migrations/0063_auto_20191024_1313.py new file mode 100644 index 000000000..ff9fe476d --- /dev/null +++ b/sapl/materia/migrations/0063_auto_20191024_1313.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-10-24 16:13 +from __future__ import unicode_literals + +from django.db import migrations, models +import sapl.materia.models +import sapl.utils + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0062_auto_20191024_1257'), + ] + + operations = [ + migrations.AlterField( + model_name='proposicao', + name='texto_original', + field=models.FileField(blank=True, max_length=300, null=True, storage=sapl.utils.OverwriteStorage(), upload_to=sapl.materia.models.materia_upload_path, validators=[sapl.utils.restringe_tipos_de_arquivo_txt], verbose_name='Texto Original'), + ), + ] diff --git a/sapl/materia/models.py b/sapl/materia/models.py index afc841ca9..97f5926d4 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -807,7 +807,7 @@ class Proposicao(models.Model): ('I', 'Incorporada')), verbose_name=_('Status Proposição')) texto_original = models.FileField( - max_length=200, + max_length=300, upload_to=materia_upload_path, blank=True, null=True,