From ece43a851b985650cfe21247957ff35070681a5f Mon Sep 17 00:00:00 2001 From: Talitha Date: Fri, 6 Apr 2018 10:07:55 -0300 Subject: [PATCH] Fix #1784 --- .../migrations/0007_adiciona_partidos.py | 2 +- .../migrations/0022_partido_observacao.py | 20 +++++++++++++++++++ sapl/parlamentares/models.py | 2 ++ sapl/templates/parlamentares/layouts.yaml | 1 + 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 sapl/parlamentares/migrations/0022_partido_observacao.py diff --git a/sapl/parlamentares/migrations/0007_adiciona_partidos.py b/sapl/parlamentares/migrations/0007_adiciona_partidos.py index 336e15d09..1842a29d8 100644 --- a/sapl/parlamentares/migrations/0007_adiciona_partidos.py +++ b/sapl/parlamentares/migrations/0007_adiciona_partidos.py @@ -23,7 +23,7 @@ def gera_partidos_tse(apps, schema_editor): # pega partidos listados em fixtures/pre_popula_partidos.json fixture_filename = 'pre_popula_partidos.json' fixture_file = os.path.join(fixture_dir, fixture_filename) - call_command('loaddata', fixture_file) + call_command('loaddata', fixture_file, ignorenonexistent=True) class Migration(migrations.Migration): diff --git a/sapl/parlamentares/migrations/0022_partido_observacao.py b/sapl/parlamentares/migrations/0022_partido_observacao.py new file mode 100644 index 000000000..567acf4c7 --- /dev/null +++ b/sapl/parlamentares/migrations/0022_partido_observacao.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.13 on 2018-04-06 13:00 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('parlamentares', '0021_clear_thumbnails_cache'), + ] + + operations = [ + migrations.AddField( + model_name='partido', + name='observacao', + field=models.TextField(blank=True, verbose_name='Observação'), + ), + ] diff --git a/sapl/parlamentares/models.py b/sapl/parlamentares/models.py index 769093046..19d4fa57c 100644 --- a/sapl/parlamentares/models.py +++ b/sapl/parlamentares/models.py @@ -112,6 +112,8 @@ class Partido(models.Model): upload_to=logo_upload_path, verbose_name=_('Logo Partido'), validators=[restringe_tipos_de_arquivo_img]) + observacao = models.TextField( + blank=True, verbose_name=_('Observação')) class Meta: verbose_name = _('Partido') diff --git a/sapl/templates/parlamentares/layouts.yaml b/sapl/templates/parlamentares/layouts.yaml index d31076100..357f0b27c 100644 --- a/sapl/templates/parlamentares/layouts.yaml +++ b/sapl/templates/parlamentares/layouts.yaml @@ -14,6 +14,7 @@ Coligacao: Partido: {% trans 'Partido Político' %}: - sigla:2 nome:4 data_criacao data_extincao + - observacao - logo_partido Dependente: