From b932d1e629381580ee2087ace4f7d41c08d37d8f Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Mon, 27 Nov 2017 15:01:18 -0200 Subject: [PATCH] =?UTF-8?q?Adiciona=20verbosa=20name=20em=20mat=C3=A9ria?= =?UTF-8?q?=20anexada=20e=20mat=C3=A9ria=20principal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0019_auto_20171127_1500.py | 26 +++++++++++++++++++ sapl/materia/models.py | 6 +++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 sapl/materia/migrations/0019_auto_20171127_1500.py diff --git a/sapl/materia/migrations/0019_auto_20171127_1500.py b/sapl/materia/migrations/0019_auto_20171127_1500.py new file mode 100644 index 000000000..2bd2c02a9 --- /dev/null +++ b/sapl/materia/migrations/0019_auto_20171127_1500.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2017-11-27 17:00 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0018_auto_20171113_1339'), + ] + + operations = [ + migrations.AlterField( + model_name='anexada', + name='materia_anexada', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materia_anexada_set', to='materia.MateriaLegislativa', verbose_name='Matéria Anexada'), + ), + migrations.AlterField( + model_name='anexada', + name='materia_principal', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materia_principal_set', to='materia.MateriaLegislativa', verbose_name='Matéria Principal'), + ), + ] diff --git a/sapl/materia/models.py b/sapl/materia/models.py index 45e95c919..d3cfebd28 100644 --- a/sapl/materia/models.py +++ b/sapl/materia/models.py @@ -330,10 +330,12 @@ class AcompanhamentoMateria(models.Model): class Anexada(models.Model): materia_principal = models.ForeignKey( MateriaLegislativa, related_name='materia_principal_set', - on_delete=models.CASCADE) + on_delete=models.CASCADE, + verbose_name=_('Matéria Principal')) materia_anexada = models.ForeignKey( MateriaLegislativa, related_name='materia_anexada_set', - on_delete=models.CASCADE) + on_delete=models.CASCADE, + verbose_name=_('Matéria Anexada')) data_anexacao = models.DateField(verbose_name=_('Data Anexação')) data_desanexacao = models.DateField( blank=True, null=True, verbose_name=_('Data Desanexação'))