Merge e35ccacc7a into d351e7c7bb

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'},
+        ),
+    ]

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 = [
+    ]

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'),
+        ),
+    ]

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 = [
+    ]

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])

sapl/materia/tests/test_materia.py

@@ -217,6 +217,9 @@ def test_documento_acessorio_submit(admin_client):
     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(
         'sapl.materia:documentoacessorio_create',
@@ -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)
 

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)