diff --git a/sapl/base/migrations/0007_auto_20170808_1713.py b/sapl/base/migrations/0007_auto_20170808_1713.py new file mode 100644 index 000000000..2fb323adf --- /dev/null +++ b/sapl/base/migrations/0007_auto_20170808_1713.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-08-08 17:13 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('base', '0006_auto_20170802_1908'), + ] + + operations = [ + migrations.AlterModelOptions( + name='autor', + options={'ordering': ('nome',), 'verbose_name': 'Autor', 'verbose_name_plural': 'Autores'}, + ), + ] diff --git a/sapl/base/migrations/0008_merge.py b/sapl/base/migrations/0008_merge.py new file mode 100644 index 000000000..45ce6eed4 --- /dev/null +++ b/sapl/base/migrations/0008_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-08-09 07:46 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('base', '0007_auto_20170808_0850'), + ('base', '0007_auto_20170808_1713'), + ] + + operations = [ + ] diff --git a/sapl/materia/migrations/0010_auto_20170808_1713.py b/sapl/materia/migrations/0010_auto_20170808_1713.py new file mode 100644 index 000000000..c5806e6c8 --- /dev/null +++ b/sapl/materia/migrations/0010_auto_20170808_1713.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-08-08 17: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', '0009_auto_20170712_0951'), + ] + + operations = [ + migrations.AlterField( + model_name='documentoacessorio', + name='arquivo', + field=models.FileField(upload_to=sapl.materia.models.anexo_upload_path, validators=[sapl.utils.restringe_tipos_de_arquivo_txt], verbose_name='Texto Integral'), + ), + migrations.AlterField( + model_name='documentoacessorio', + name='data', + field=models.DateField(verbose_name='Data'), + ), + ] diff --git a/sapl/materia/migrations/0012_merge.py b/sapl/materia/migrations/0012_merge.py new file mode 100644 index 000000000..72b097cd8 --- /dev/null +++ b/sapl/materia/migrations/0012_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2017-08-09 07:46 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0011_auto_20170808_1034'), + ('materia', '0010_auto_20170808_1713'), + ] + + operations = [ + ] diff --git a/sapl/materia/models.py b/sapl/materia/models.py index 36d375068..2490269b0 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -413,14 +413,12 @@ class DocumentoAcessorio(models.Model): on_delete=models.PROTECT, verbose_name=_('Tipo')) nome = models.CharField(max_length=50, verbose_name=_('Nome')) - data = models.DateField(blank=True, null=True, verbose_name=_('Data')) + data = models.DateField(verbose_name=_('Data')) autor = models.CharField( max_length=50, blank=True, verbose_name=_('Autor')) ementa = models.TextField(blank=True, verbose_name=_('Ementa')) indexacao = models.TextField(blank=True) arquivo = models.FileField( - blank=True, - null=True, upload_to=anexo_upload_path, verbose_name=_('Texto Integral'), validators=[restringe_tipos_de_arquivo_txt]) diff --git a/sapl/materia/tests/test_materia.py b/sapl/materia/tests/test_materia.py index 5366959d2..2c093ff9c 100644 --- a/sapl/materia/tests/test_materia.py +++ b/sapl/materia/tests/test_materia.py @@ -216,6 +216,9 @@ def test_documento_acessorio_submit(admin_client): # Cria um tipo de documento tipo = mommy.make(TipoDocumento, descricao='Teste') + + file_content = 'file_content' + arquivo = SimpleUploadedFile("file.txt", file_content.encode('UTF-8')) # Testa POST response = admin_client.post(reverse( @@ -226,6 +229,8 @@ def test_documento_acessorio_submit(admin_client): 'data_materia': '2016-03-21', 'autor': autor, 'ementa': 'teste_ementa', + 'data': '2016-03-21', + 'arquivo': arquivo, 'salvar': 'salvar'}, follow=True) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index bfa996b68..dae7c13a4 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1065,6 +1065,11 @@ class DocumentoAcessorioCrud(MasterDetailCrud): def __init__(self, **kwargs): super(MasterDetailCrud.CreateView, self).__init__(**kwargs) + def get_initial(self): + self.initial['data'] = datetime.now().date() + + return self.initial + def get_context_data(self, **kwargs): context = super( MasterDetailCrud.CreateView, self).get_context_data(**kwargs)